Bug 1280791 - Don't apply min-width to the command-button-frames checkbox in firebug theme r?Honza
MozReview-Commit-ID: 37MWBu3WMD8
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/toolbox.css" type="text/css"?>
<?xml-stylesheet href="resource://devtools/client/shared/components/notification-box.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % toolboxDTD SYSTEM "chrome://devtools/locale/toolbox.dtd" >
%toolboxDTD;
<!ENTITY % editMenuStrings SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -146,16 +146,17 @@ devtools.jar:
% 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/dark-theme.css (themes/dark-theme.css)
skin/light-theme.css (themes/light-theme.css)
skin/firebug-theme.css (themes/firebug-theme.css)
skin/toolbars.css (themes/toolbars.css)
+ skin/toolbox.css (themes/toolbox.css)
skin/tooltips.css (themes/tooltips.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/angle-swatch.svg (themes/images/angle-swatch.svg)
skin/images/pseudo-class.svg (themes/images/pseudo-class.svg)
skin/images/controls.png (themes/images/controls.png)
--- a/devtools/client/themes/firebug-theme.css
+++ b/devtools/client/themes/firebug-theme.css
@@ -239,11 +239,8 @@
border-width: 1px !important;
min-width: 24px;
}
.theme-firebug .devtools-toolbarbutton {
min-width: 24px;
}
-.theme-firebug #command-button-frames {
- min-width: 32px;
-}
--- a/devtools/client/themes/toolbars.css
+++ b/devtools/client/themes/toolbars.css
@@ -748,74 +748,16 @@
}
.command-button:hover:active::before,
.command-button[checked=true]::before,
.command-button[open=true]::before {
opacity: 1;
}
-/* Toolbox command buttons */
-
-#command-button-paintflashing::before {
- background-image: var(--command-paintflashing-image);
-}
-
-#command-button-screenshot::before {
- background-image: var(--command-screenshot-image);
-}
-
-#command-button-responsive::before {
- background-image: var(--command-responsive-image);
-}
-
-#command-button-scratchpad::before {
- background-image: var(--command-scratchpad-image);
-}
-
-#command-button-pick::before {
- background-image: var(--command-pick-image);
-}
-
-#command-button-splitconsole::before {
- background-image: var(--command-splitconsole-image);
-}
-
-#command-button-noautohide::before {
- background-image: var(--command-noautohide-image);
-}
-
-#command-button-eyedropper::before {
- background-image: var(--command-eyedropper-image);
-}
-
-#command-button-rulers::before {
- background-image: var(--command-rulers-image);
-}
-
-#command-button-measure::before {
- background-image: var(--command-measure-image);
-}
-
-#command-button-frames::before {
- background-image: var(--command-frames-image);
-}
-
-#command-button-frames {
- background: url("chrome://devtools/skin/images/dropmarker.svg") no-repeat right;
-
- /* Override background-size from the command-button.
- The drop down arrow is smaller */
- background-size: 8px 4px !important;
-}
-
-#command-button-frames:-moz-dir(rtl) {
- background-position: left;
-}
-
/* Tabs */
.devtools-tabbar {
-moz-appearance: none;
min-height: 24px;
border: 0px solid;
border-bottom-width: 1px;
padding: 0;
new file mode 100644
--- /dev/null
+++ b/devtools/client/themes/toolbox.css
@@ -0,0 +1,63 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* 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/. */
+
+ /* Toolbox command buttons */
+
+#command-button-paintflashing::before {
+ background-image: var(--command-paintflashing-image);
+ }
+
+#command-button-screenshot::before {
+ background-image: var(--command-screenshot-image);
+ }
+
+#command-button-responsive::before {
+ background-image: var(--command-responsive-image);
+}
+
+#command-button-scratchpad::before {
+ background-image: var(--command-scratchpad-image);
+}
+
+#command-button-pick::before {
+ background-image: var(--command-pick-image);
+}
+
+#command-button-splitconsole::before {
+ background-image: var(--command-splitconsole-image);
+}
+
+#command-button-noautohide::before {
+ background-image: var(--command-noautohide-image);
+}
+
+#command-button-eyedropper::before {
+ background-image: var(--command-eyedropper-image);
+}
+
+#command-button-rulers::before {
+ background-image: var(--command-rulers-image);
+}
+
+#command-button-measure::before {
+ background-image: var(--command-measure-image);
+}
+
+#command-button-frames::before {
+ background-image: var(--command-frames-image);
+}
+
+#command-button-frames {
+ background: url("chrome://devtools/skin/images/dropmarker.svg") no-repeat right;
+
+ /* Override background-size from the command-button.
+ The drop down arrow is smaller */
+ background-size: 8px 4px !important;
+ min-width: 32px;
+}
+
+#command-button-frames:-moz-dir(rtl) {
+ background-position: left;
+}