From c331f9d12f7ea5c49ffdd9191c4daa2dc7a2cd4a Mon Sep 17 00:00:00 2001 From: Jan Odvarko Date: Thu, 19 Jan 2017 13:52:40 +0100 Subject: [PATCH] Bug 1330827 - Fix CSS for Tab's cursor and background; r=jryans MozReview-Commit-ID: GZd51GV3nFP --HG-- extra : rebase_source : 318ce731f97f05234fb53f3614c0119e88bc1724 --- devtools/client/jsonview/converter-child.js | 3 +++ devtools/client/shared/components/tabs/tabbar.css | 4 ---- devtools/client/shared/components/tabs/tabs.css | 4 ++++ devtools/client/themes/moz.build | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/devtools/client/jsonview/converter-child.js b/devtools/client/jsonview/converter-child.js index 7f22c4bcc8bd..91cfb533cf17 100644 --- 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 + "\">" + "" + + "" + "" + "" + "" + diff --git a/devtools/client/shared/components/tabs/tabbar.css b/devtools/client/shared/components/tabs/tabbar.css index 39ef7f98af0b..df14fac64c38 100644 --- 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' diff --git a/devtools/client/shared/components/tabs/tabs.css b/devtools/client/shared/components/tabs/tabs.css index b0693218f6d1..d203a42c6463 100644 --- 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 { diff --git a/devtools/client/themes/moz.build b/devtools/client/themes/moz.build index 4b349dbacc74..543f4eff0411 100644 --- 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', )