Backed out changeset bac08b0a467d (
bug 1235781) for breaking dt tests on a CLOSED TREE. r=backout
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -3,17 +3,17 @@
# -*- Mode: HTML -*-
#
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -143,19 +143,17 @@ devtools.jar:
content/shared/widgets/filter-widget.css (shared/widgets/filter-widget.css)
content/eyedropper/eyedropper.xul (eyedropper/eyedropper.xul)
content/eyedropper/crosshairs.css (eyedropper/crosshairs.css)
content/eyedropper/nocursor.css (eyedropper/nocursor.css)
content/aboutdebugging/aboutdebugging.xhtml (aboutdebugging/aboutdebugging.xhtml)
content/aboutdebugging/aboutdebugging.css (aboutdebugging/aboutdebugging.css)
content/aboutdebugging/aboutdebugging.js (aboutdebugging/aboutdebugging.js)
% skin devtools classic/1.0 %skin/
- skin/devtools-browser.css (themes/devtools-browser.css)
- skin/common.css (themes/common.css)
- skin/splitters.css (themes/splitters.css)
+* skin/common.css (themes/common.css)
skin/dark-theme.css (themes/dark-theme.css)
skin/light-theme.css (themes/light-theme.css)
skin/toolbars.css (themes/toolbars.css)
skin/variables.css (themes/variables.css)
skin/images/add.svg (themes/images/add.svg)
skin/images/filters.svg (themes/images/filters.svg)
skin/images/filter-swatch.svg (themes/images/filter-swatch.svg)
skin/images/pseudo-class.svg (themes/images/pseudo-class.svg)
--- a/devtools/client/themes/common.css
+++ b/devtools/client/themes/common.css
@@ -1,53 +1,86 @@
+%if 0
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
-
-@import url("splitters.css");
+%endif
:root {
font: message-box;
-}
-
-:root[platform="mac"] {
+%ifdef XP_MACOSX
--monospace-font-family: Menlo, monospace;
-}
-
-:root[platform="win"] {
+%elifdef XP_WIN
--monospace-font-family: Consolas, monospace;
-}
-
-:root[platform="linux"] {
+%else
--monospace-font-family: monospace;
+%endif
}
.devtools-monospace {
font-family: var(--monospace-font-family);
+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+ font-size: 80%;
+%endif
+}
+
+/* Bottom-docked toolbox minimize transition */
+.devtools-toolbox-bottom-iframe {
+ transition: margin-bottom .1s;
}
-:root[platform="linux"] .devtools-monospace {
- font-size: 80%;
+/* Splitters */
+.devtools-horizontal-splitter {
+ -moz-appearance: none;
+ background-image: none;
+ background-color: transparent;
+ border: 0;
+ border-bottom: 1px solid rgba(118, 121, 125, .5);
+ min-height: 3px;
+ height: 3px;
+ margin-top: -3px;
+ position: relative;
}
+.devtools-side-splitter {
+ -moz-appearance: none;
+ background-image: none;
+ background-color: transparent;
+ border: 0;
+ -moz-border-end: 1px solid rgba(118, 121, 125, .5);
+ min-width: 3px;
+ width: 3px;
+ -moz-margin-start: -3px;
+ position: relative;
+ cursor: e-resize;
+}
+
+.devtools-horizontal-splitter.disabled,
+.devtools-side-splitter.disabled {
+ pointer-events: none;
+}
+
+.devtools-toolbox-side-iframe {
+ min-width: 465px;
+}
/* Autocomplete Popup */
/* Dark and light theme */
.devtools-autocomplete-popup {
-moz-appearance: none !important;
box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
background-color: transparent;
border-radius: 3px;
overflow-x: hidden;
+%if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
+ max-height: 32rem;
+%else
max-height: 40rem;
-}
-
-:root[platform="linux"] .devtools-autocomplete-popup {
- max-height: 32rem;
+%endif
}
.devtools-autocomplete-listbox {
-moz-appearance: none !important;
background-color: transparent;
border-width: 0px !important;
}
deleted file mode 100644
--- a/devtools/client/themes/devtools-browser.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-@import url("splitters.css");
-
-/* Bottom-docked toolbox minimize transition */
-.devtools-toolbox-bottom-iframe {
- transition: margin-bottom .1s;
-}
-
-.devtools-toolbox-side-iframe {
- min-width: 465px;
-}
-
deleted file mode 100644
--- a/devtools/client/themes/splitters.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-/* Splitters */
-.devtools-horizontal-splitter {
- -moz-appearance: none;
- background-image: none;
- background-color: transparent;
- border: 0;
- border-bottom: 1px solid rgba(118, 121, 125, .5);
- min-height: 3px;
- height: 3px;
- margin-top: -3px;
- position: relative;
-}
-
-.devtools-side-splitter {
- -moz-appearance: none;
- background-image: none;
- background-color: transparent;
- border: 0;
- -moz-border-end: 1px solid rgba(118, 121, 125, .5);
- min-width: 3px;
- width: 3px;
- -moz-margin-start: -3px;
- position: relative;
- cursor: e-resize;
-}
-
-.devtools-horizontal-splitter.disabled,
-.devtools-side-splitter.disabled {
- pointer-events: none;
-}