Backed out changeset cf116f73a2d2 (bug 1330827) for bustage

CLOSED TREE
2017-01-20 15:49:06 +08:00
parent 806a629e28
commit c86265016d
4 changed files with 4 additions and 8 deletions
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@@ -214,7 +214,6 @@ Converter.prototype = {
    let baseUrl = clientBaseUrl + "jsonview/";
    let themeVarsUrl = clientBaseUrl + "themes/variables.css";
    let commonUrl = clientBaseUrl + "themes/common.css";
-    let toolbarsUrl = clientBaseUrl + "themes/toolbars.css";

    let os;
    let platform = Services.appinfo.OS;
@@ -239,8 +238,6 @@ Converter.prototype = {
        themeVarsUrl + "\">" +
      "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
        commonUrl + "\">" +
-      "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
-        toolbarsUrl + "\">" +
      "<link rel=\"stylesheet\" type=\"text/css\" href=\"css/main.css\">" +
      "<script data-main=\"viewer-config\" src=\"lib/require.js\"></script>" +
      "</head><body>" +
--- a/devtools/client/shared/components/tabs/tabbar.css
+++ b/devtools/client/shared/components/tabs/tabbar.css
@@ -29,6 +29,10 @@
  height: 28px;
 }

+.tabs .tabs-menu-item a {
+  cursor: default;
+}
+
 /* The tab takes entire horizontal space and individual tabs
  should stretch accordingly. Use flexbox for the behavior.
  Use also `overflow: hidden` so, 'overflow' and 'underflow'
--- a/devtools/client/shared/components/tabs/tabs.css
+++ b/devtools/client/shared/components/tabs/tabs.css
@@ -30,10 +30,6 @@
  white-space: nowrap;
 }

-.tabs .tabs-menu-item a {
-  cursor: default;
-}
-
 /* Make sure panel content takes entire vertical space.
  (minus the height of the tab bar) */
 .tabs .panels {
--- a/devtools/client/themes/moz.build
+++ b/devtools/client/themes/moz.build
@@ -11,6 +11,5 @@ DIRS += [
 DevToolsModules(
    'common.css',
    'splitters.css',
-    'toolbars.css',
    'variables.css',
 )