Bug 1330827 - Fix CSS for Tab's cursor and background. r=jryans, a=jcristau
authorJan Odvarko <odvarko@gmail.com>
Thu, 19 Jan 2017 13:52:40 +0100
changeset 375640 149c9a185c28c53b5e57df9c70bc9a74258d8539
parent 375639 3a2b54dddbe21c11e174c17ab3dd94096528980d
child 375641 78cdaba206c0d571596e3b776b492e6f8979e93d
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjryans, jcristau
bugs1330827
milestone53.0a2
Bug 1330827 - Fix CSS for Tab's cursor and background. r=jryans, a=jcristau MozReview-Commit-ID: GZd51GV3nFP
browser/installer/allowed-dupes.mn
devtools/client/jsonview/converter-child.js
devtools/client/shared/components/tabs/tabbar.css
devtools/client/shared/components/tabs/tabs.css
devtools/client/themes/moz.build
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -43,18 +43,20 @@ browser/chrome/devtools/modules/devtools
 browser/chrome/devtools/modules/devtools/client/inspector/inspector.xhtml
 browser/chrome/devtools/modules/devtools/client/jsonview/css/controls.png
 browser/chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png
 browser/chrome/devtools/modules/devtools/client/memory/initializer.js
 browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
 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
 browser/chrome/devtools/skin/images/debugger-blackbox.svg
 browser/chrome/devtools/skin/images/debugger-prettyprint.svg
 browser/chrome/devtools/skin/images/filetypes/store.svg
 browser/chrome/devtools/skin/images/itemToggle.svg
 browser/chrome/devtools/skin/images/security-state-broken.svg
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@@ -209,16 +209,17 @@ Converter.prototype = {
   },
 
   toHTML: function (json, headers, title) {
     let themeClassName = "theme-" + JsonViewUtils.getCurrentTheme();
     let clientBaseUrl = "resource://devtools/client/";
     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;
     if (platform.startsWith("WINNT")) {
       os = "win";
     } else if (platform.startsWith("Darwin")) {
       os = "mac";
     } else {
@@ -233,16 +234,18 @@ Converter.prototype = {
       "<html platform=\"" + os + "\" class=\"" + themeClassName +
         "\" dir=\"" + dir + "\">" +
       "<head><title>" + this.htmlEncode(title) + "</title>" +
       "<base href=\"" + this.htmlEncode(baseUrl) + "\">" +
       "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
         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>" +
       "<div id=\"content\"></div>" +
       "<div id=\"json\">" + this.htmlEncode(json) + "</div>" +
       "<div id=\"headers\">" + this.htmlEncode(headers) + "</div>" +
       "</body></html>";
   },
--- a/devtools/client/shared/components/tabs/tabbar.css
+++ b/devtools/client/shared/components/tabs/tabbar.css
@@ -24,20 +24,16 @@
   height: 23px;
 }
 
 /* Firebug theme is using slightly different height. */
 .theme-firebug .tabs .tabs-navigation {
   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'
   events are fired (it's utilized by the all-tabs-menu). */
 .tabs .tabs-navigation .tabs-menu {
   overflow: hidden;
   display: flex;
 }
--- a/devtools/client/shared/components/tabs/tabs.css
+++ b/devtools/client/shared/components/tabs/tabs.css
@@ -25,16 +25,20 @@
   display: block;
   color: #A9A9A9;
   padding: 4px 8px;
   border: 1px solid transparent;
   text-decoration: none;
   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 {
   height: calc(100% - 24px);
 }
 
 .tabs .tab-panel {
   height: 100%;
--- a/devtools/client/themes/moz.build
+++ b/devtools/client/themes/moz.build
@@ -6,10 +6,11 @@
 
 DIRS += [
     'audio',
 ]
 
 DevToolsModules(
     'common.css',
     'splitters.css',
+    'toolbars.css',
     'variables.css',
 )