Bug 1183280 - Remove most devtools preprocessing rule in CSS files. r=bgrins

This commit is contained in:
Alexandre Poirot 2016-01-12 04:28:13 -08:00
parent dea50a5d3d
commit 91b337208f
7 changed files with 69 additions and 113 deletions

View File

@ -161,7 +161,7 @@ devtools.jar:
skin/images/controls@2x.png (themes/images/controls@2x.png)
skin/images/animation-fast-track.svg (themes/images/animation-fast-track.svg)
skin/images/performance-icons.svg (themes/images/performance-icons.svg)
* skin/widgets.css (themes/widgets.css)
skin/widgets.css (themes/widgets.css)
skin/images/power.svg (themes/images/power.svg)
skin/images/filetypes/dir-close.svg (themes/images/filetypes/dir-close.svg)
skin/images/filetypes/dir-open.svg (themes/images/filetypes/dir-open.svg)
@ -171,7 +171,7 @@ devtools.jar:
skin/images/commandline-icon@2x.png (themes/images/commandline-icon@2x.png)
skin/images/alerticon-warning.png (themes/images/alerticon-warning.png)
skin/images/alerticon-warning@2x.png (themes/images/alerticon-warning@2x.png)
* skin/rules.css (themes/rules.css)
skin/rules.css (themes/rules.css)
skin/commandline.css (themes/commandline.css)
skin/images/command-paintflashing.png (themes/images/command-paintflashing.png)
skin/images/command-paintflashing@2x.png (themes/images/command-paintflashing@2x.png)
@ -201,7 +201,7 @@ devtools.jar:
skin/images/editor-breakpoint@2x.png (themes/images/editor-breakpoint@2x.png)
skin/images/editor-debug-location.png (themes/images/editor-debug-location.png)
skin/images/editor-debug-location@2x.png (themes/images/editor-debug-location@2x.png)
* skin/webconsole.css (themes/webconsole.css)
skin/webconsole.css (themes/webconsole.css)
skin/images/webconsole.svg (themes/images/webconsole.svg)
skin/images/breadcrumbs-divider@2x.png (themes/images/breadcrumbs-divider@2x.png)
skin/images/breadcrumbs-scrollbutton.png (themes/images/breadcrumbs-scrollbutton.png)
@ -210,7 +210,7 @@ devtools.jar:
skin/eyedropper.css (themes/eyedropper.css)
skin/canvasdebugger.css (themes/canvasdebugger.css)
skin/debugger.css (themes/debugger.css)
* skin/netmonitor.css (themes/netmonitor.css)
skin/netmonitor.css (themes/netmonitor.css)
skin/performance.css (themes/performance.css)
skin/memory.css (themes/memory.css)
skin/promisedebugger.css (themes/promisedebugger.css)
@ -218,7 +218,7 @@ devtools.jar:
skin/scratchpad.css (themes/scratchpad.css)
skin/shadereditor.css (themes/shadereditor.css)
skin/storage.css (themes/storage.css)
* skin/splitview.css (themes/splitview.css)
skin/splitview.css (themes/splitview.css)
skin/styleeditor.css (themes/styleeditor.css)
skin/webaudioeditor.css (themes/webaudioeditor.css)
skin/images/magnifying-glass.png (themes/images/magnifying-glass.png)
@ -281,7 +281,7 @@ devtools.jar:
skin/images/dock-side@2x.png (themes/images/dock-side@2x.png)
* skin/floating-scrollbars.css (themes/floating-scrollbars.css)
skin/floating-scrollbars-light.css (themes/floating-scrollbars-light.css)
* skin/inspector.css (themes/inspector.css)
skin/inspector.css (themes/inspector.css)
skin/images/profiler-stopwatch.svg (themes/images/profiler-stopwatch.svg)
skin/images/emojis/emoji-command-pick.svg (themes/images/emojis/emoji-command-pick.svg)
skin/images/emojis/emoji-tool-webconsole.svg (themes/images/emojis/emoji-tool-webconsole.svg)

View File

@ -3,18 +3,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%ifdef XP_MACOSX
#inspector-toolbar:-moz-locale-dir(ltr) {
:root[platform="mac"] #inspector-toolbar:-moz-locale-dir(ltr) {
padding-left: 2px;
}
#inspector-toolbar:-moz-locale-dir(rtl) {
:root[platform="mac"] #inspector-toolbar:-moz-locale-dir(rtl) {
padding-left: 4px;
}
%endif
#inspector-searchlabel {
overflow: hidden;
}

View File

@ -825,43 +825,40 @@
}
/* Platform overrides (copied in from the old platform specific files) */
%ifdef XP_WIN
.requests-menu-header-button > .button-box {
:root[platform="win"] .requests-menu-header-button > .button-box {
padding: 0;
}
.requests-menu-timings-division {
:root[platform="win"] .requests-menu-timings-division {
padding-top: 1px;
font-size: 90%;
}
.requests-menu-footer-button,
.requests-menu-footer-label {
:root[platform="win"] .requests-menu-footer-button,
:root[platform="win"] .requests-menu-footer-label {
padding-top: 0px;
padding-bottom: 0px;
}
/* Responsive sidebar */
@media (max-width: 700px) {
.requests-menu-footer-button,
.requests-menu-footer-label {
:root[platform="win"] .requests-menu-footer-button,
:root[platform="win"] .requests-menu-footer-label {
padding-top: 0px;
padding-bottom: 0px;
}
}
%elifdef XP_LINUX
#headers-summary-resend {
:root[platform="linux"] #headers-summary-resend {
padding: 4px;
}
#toggle-raw-headers {
:root[platform="linux"] #toggle-raw-headers {
padding: 4px;
}
/* Responsive sidebar */
@media (max-width: 700px) {
.requests-menu-header-button {
:root[platform="linux"] .requests-menu-header-button {
font-size: 85%;
}
}
%endif

View File

@ -46,9 +46,11 @@
padding: 1px 4px;
-moz-user-select: none;
word-wrap: break-word;
%ifndef XP_MACOSX
}
:root[platform="win"] .ruleview-header,
:root[platform="linux"] .ruleview-header {
margin-top: 4px;
%endif
}
.ruleview-rule-pseudo-element {

View File

@ -3,13 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%filter substitution
%define smw_marginDark #000
%define smw_marginLight #aaa
%define smw_itemDarkTopBorder rgba(0,0,0,0.2)
%define smw_itemDarkBottomBorder rgba(128,128,128,0.15)
%define smw_itemLightTopBorder rgba(128,128,128,0.15)
%define smw_itemLightBottomBorder transparent
.theme-dark {
--smw-margin: #000;
--smw-item-top-border: rgba(0,0,0,0.2);
--smw-item-bottom-border: rgba(128,128,128,0.15);
}
.theme-light {
--smw-margin: #aaa;
--smw-item-top-border: rgba(128,128,128,0.15);
--smw-item-bottom-border: transparent;
}
.splitview-nav-container .devtools-throbber {
display: none;
@ -30,22 +33,11 @@
list-style: none;
padding: 0;
margin: 0;
box-shadow: inset -1px 0 0 var(--smw-margin);
}
.theme-dark .splitview-nav {
box-shadow: inset -1px 0 0 @smw_marginDark@;
}
.theme-dark .splitview-nav:-moz-locale-dir(rtl) {
box-shadow: inset 1px 0 0 @smw_marginDark@;
}
.theme-light .splitview-nav {
box-shadow: inset -1px 0 0 @smw_marginLight@;
}
.theme-light .splitview-nav:-moz-locale-dir(rtl) {
box-shadow: inset 1px 0 0 @smw_marginLight@;
.splitview-nav:-moz-locale-dir(rtl) {
box-shadow: inset 1px 0 0 var(--smw-margin);
}
.splitview-nav > li {
@ -58,22 +50,13 @@
vertical-align: bottom;
}
.theme-dark .splitview-nav > li {
border-top: 1px solid @smw_itemDarkTopBorder@;
border-bottom: 1px solid @smw_itemDarkBottomBorder@;
.splitview-nav > li {
border-top: 1px solid var(--smw-item-top-border);
border-bottom: 1px solid var(--smw-item-bottom-border);
}
.theme-dark .splitview-nav > li:last-of-type {
box-shadow: inset 0 -1px 0 @smw_itemDarkTopBorder@;
}
.theme-light .splitview-nav > li {
border-top: 1px solid @smw_itemLightTopBorder@;
border-bottom: 1px solid @smw_itemLightBottomBorder@;
}
.theme-light .splitview-nav > li:last-of-type {
box-shadow: inset 0 -1px 0 @smw_itemLightTopBorder@;
.splitview-nav > li:last-of-type {
box-shadow: inset 0 -1px 0 var(--smw-item-top-border);
}
.placeholder {
@ -94,25 +77,25 @@
.theme-dark .splitview-nav > li.splitview-active {
background-image: url(images/itemArrow-dark-ltr.svg),
linear-gradient(@smw_marginDark@, @smw_marginDark@),
linear-gradient(var(--smw-margin), var(--smw-margin)),
linear-gradient(#1d4f73, #1d4f73);
}
.theme-dark .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
background-image: url(images/itemArrow-dark-rtl.svg),
linear-gradient(@smw_marginDark@, @smw_marginDark@),
linear-gradient(var(--smw-margin), var(--smw-margin)),
linear-gradient(#1d4f73, #1d4f73);
}
.theme-light .splitview-nav > li.splitview-active {
background-image: url(images/itemArrow-ltr.svg),
linear-gradient(@smw_marginLight@, @smw_marginLight@),
linear-gradient(var(--smw-margin), var(--smw-margin)),
linear-gradient(#4c9ed9, #4c9ed9);
}
.theme-light .splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
background-image: url(images/itemArrow-rtl.svg),
linear-gradient(@smw_marginLight@, @smw_marginLight@),
linear-gradient(var(--smw-margin), var(--smw-margin)),
linear-gradient(#4c9ed9, #4c9ed9);
}
@ -123,14 +106,9 @@
background-clip: border-box;
}
.theme-dark .splitview-main > toolbar,
.theme-dark .loading .splitview-nav-container {
-moz-border-end: 1px solid @smw_marginDark@;
}
.theme-light .splitview-main > toolbar,
.theme-light .loading .splitview-nav-container {
-moz-border-end: 1px solid @smw_marginLight@;
.splitview-main > toolbar,
.loading .splitview-nav-container {
-moz-border-end: 1px solid var(--smw-margin);
}
.splitview-main > .devtools-toolbarbutton {

View File

@ -574,13 +574,11 @@ a {
}
}
%ifdef XP_WIN
/*
* This hardcoded width likely due to a toolkit Windows specific bug.
* See http://hg.mozilla.org/mozilla-central/annotate/f38d6df93cad/toolkit/themes/winstripe/global/textbox-aero.css#l7
*/
.hud-filter-box {
:root[platform="win"] .hud-filter-box {
width: 200px;
}
%endif

View File

@ -3,20 +3,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%filter substitution
%define smw_marginDark #000
%define smw_marginLight #aaa
%define smw_itemDarkTopBorder rgba(0,0,0,0.2)
%define smw_itemDarkBottomBorder rgba(128,128,128,0.15)
%define smw_itemLightTopBorder rgba(128,128,128,0.15)
%define smw_itemLightBottomBorder transparent
.theme-dark {
--table-splitter-color: rgba(255,255,255,0.15);
--table-zebra-background: rgba(255,255,255,0.05);
--smw-margin: #000;
--smw-item-top-border: rgba(0,0,0,0.2);
--smw-item-bottom-border: rgba(128,128,128,0.15);
}
.theme-light {
--table-splitter-color: rgba(0,0,0,0.15);
--table-zebra-background: rgba(0,0,0,0.05);
--smw-margin: #aaa;
--smw-item-top-border: rgba(128,128,128,0.15);
--smw-item-bottom-border: transparent;
}
/* Generic pane helpers */
@ -220,11 +219,9 @@
padding-bottom: 0;
}
%ifdef XP_WIN
.breadcrumbs-widget-item:-moz-focusring > .button-box {
:root[platform="win"] .breadcrumbs-widget-item:-moz-focusring > .button-box {
border-width: 0;
}
%endif
.breadcrumbs-widget-item:not([checked]) {
background: -moz-element(#breadcrumb-separator-normal) no-repeat center left;
@ -358,24 +355,14 @@
/* SideMenuWidget container */
.theme-dark .side-menu-widget-container:-moz-locale-dir(ltr),
.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(ltr) {
box-shadow: inset -1px 0 0 @smw_marginDark@;
}
.theme-dark .side-menu-widget-container:-moz-locale-dir(rtl),
.theme-dark .side-menu-widget-empty-text:-moz-locale-dir(rtl) {
box-shadow: inset 1px 0 0 @smw_marginDark@;
}
.side-menu-widget-container:-moz-locale-dir(ltr),
.side-menu-widget-empty-text:-moz-locale-dir(ltr) {
box-shadow: inset -1px 0 0 @smw_marginLight@;
box-shadow: inset -1px 0 0 var(--smw-margin);
}
.side-menu-widget-container:-moz-locale-dir(rtl),
.side-menu-widget-empty-text:-moz-locale-dir(rtl) {
box-shadow: inset 1px 0 0 @smw_marginLight@;
box-shadow: inset 1px 0 0 var(--smw-margin);
}
.side-menu-widget-group {
@ -412,26 +399,23 @@
background-clip: padding-box;
}
.side-menu-widget-item {
border-top: 1px solid var(--smw-item-top-border);
border-bottom: 1px solid var(--smw-item-bottom-border);
}
.side-menu-widget-item:last-of-type {
box-shadow: inset 0 -1px 0 var(--smw-item-top-border);
}
.theme-dark .side-menu-widget-item {
border-top: 1px solid @smw_itemDarkTopBorder@;
border-bottom: 1px solid @smw_itemDarkBottomBorder@;
color: var(--theme-selection-color);
}
.theme-dark .side-menu-widget-item:last-of-type {
box-shadow: inset 0 -1px 0 @smw_itemDarkTopBorder@;
}
.theme-light .side-menu-widget-item {
border-top: 1px solid @smw_itemLightTopBorder@;
border-bottom: 1px solid @smw_itemLightBottomBorder@;
color: var(--theme-body-color);
}
.theme-light .side-menu-widget-item:last-of-type {
box-shadow: inset 0 -1px 0 @smw_itemLightTopBorder@;
}
.side-menu-widget-item.selected {
background-color: var(--theme-selection-background);
color: var(--theme-selection-color);
@ -459,19 +443,19 @@
}
.theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
background-image: url(images/itemArrow-dark-ltr.svg), linear-gradient(to right, @smw_marginDark@, @smw_marginDark@);
background-image: url(images/itemArrow-dark-ltr.svg), linear-gradient(to right, var(--smw-margin), var(--smw-margin));
}
.theme-dark .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
background-image: url(images/itemArrow-dark-rtl.svg), linear-gradient(to right, @smw_marginDark@, @smw_marginDark@);
background-image: url(images/itemArrow-dark-rtl.svg), linear-gradient(to right, var(--smw-margin), var(--smw-margin));
}
.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(ltr) {
background-image: url(images/itemArrow-ltr.svg), linear-gradient(to right, @smw_marginLight@, @smw_marginLight@);
background-image: url(images/itemArrow-ltr.svg), linear-gradient(to right, var(--smw-margin), var(--smw-margin));
}
.theme-light .side-menu-widget-item.selected > .side-menu-widget-item-arrow:-moz-locale-dir(rtl) {
background-image: url(images/itemArrow-rtl.svg), linear-gradient(to right, @smw_marginLight@, @smw_marginLight@);
background-image: url(images/itemArrow-rtl.svg), linear-gradient(to right, var(--smw-margin), var(--smw-margin));
}
/* SideMenuWidget items contents */