Bug 1330827 - Fix CSS for Tab's cursor and background; r=jryans

MozReview-Commit-ID: GZd51GV3nFP --HG-- extra : rebase_source : 86fa688ac8979ddd7a747827d082f092ac5b2225
2017-01-19 13:52:40 +01:00 · 2017-01-19 13:52:40 +01:00 · 718c5a245c
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@ -48,8 +48,10 @@ browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdi
 browser/chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
 browser/chrome/devtools/modules/devtools/client/shared/theme-switching.js
 browser/chrome/devtools/modules/devtools/client/themes/common.css
+browser/chrome/devtools/modules/devtools/client/themes/toolbars.css
 browser/chrome/devtools/modules/devtools/client/themes/variables.css
 browser/chrome/devtools/skin/common.css
+browser/chrome/devtools/skin/toolbars.css
 browser/chrome/devtools/skin/images/command-scratchpad.svg
 browser/chrome/devtools/skin/images/controls.png
 browser/chrome/devtools/skin/images/controls@2x.png
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@ -214,6 +214,7 @@ 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;
@ -238,6 +239,8 @@ 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,10 +29,6 @@
  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,6 +30,10 @@
  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,5 +11,6 @@ DIRS += [
 DevToolsModules(
    'common.css',
    'splitters.css',
+    'toolbars.css',
    'variables.css',
 )