Bug 1410540 - Merge viewbutton.css into pageInfo.css for osx;r=dao
Page Info is the only place viewbutton.css is referenced
MozReview-Commit-ID: 3wlMTmcwpx0
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -12,17 +12,17 @@ browser.jar:
* skin/classic/browser/compacttheme.css
skin/classic/browser/subtle-pattern.png
skin/classic/browser/panel-expander-closed.png
skin/classic/browser/panel-expander-closed@2x.png
skin/classic/browser/panel-expander-open.png
skin/classic/browser/panel-expander-open@2x.png
skin/classic/browser/panel-plus-sign.png
skin/classic/browser/page-livemarks.png
- skin/classic/browser/pageInfo.css
+* skin/classic/browser/pageInfo.css
skin/classic/browser/searchbar.css
skin/classic/browser/slowStartup-16.png
skin/classic/browser/toolbarbutton-dropmarker.png
skin/classic/browser/toolbarbutton-dropmarker@2x.png
skin/classic/browser/webRTC-indicator.css
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
--- a/browser/themes/osx/pageInfo.css
+++ b/browser/themes/osx/pageInfo.css
@@ -1,16 +1,46 @@
/* 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 "chrome://global/skin/";
-/* View buttons */
-@import "chrome://global/skin/viewbuttons.css";
+%include shared.inc
+
+#topBar {
+ -moz-appearance: toolbar;
+}
+
+.viewGroupWrapper {
+ -moz-box-align: center;
+ -moz-box-pack: center;
+}
+
+#viewGroup {
+ margin: 4px 0 9px;
+}
+
+#viewGroup > radio,
+#viewGroup > toolbarbutton {
+ -moz-box-orient: vertical;
+ -moz-box-align: center;
+ -moz-appearance: toolbarbutton;
+ font: menu;
+ text-shadow: @loweredShadow@;
+ margin: 0;
+ padding: 0 1px;
+ height: 22px;
+}
+
+#viewGroup > radio[selected=true],
+#viewGroup > toolbarbutton[checked=true] {
+ color: #FFF !important;
+ text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
+}
deck {
padding: 10px 10px 10px 10px;
}
/* Misc */
tree {
margin: .5em;
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -36,17 +36,16 @@ toolkit.jar:
skin/classic/global/splitter.css
skin/classic/global/tabprompts.css
skin/classic/global/tabbox.css
skin/classic/global/textbox.css
skin/classic/global/datetimepicker.css
skin/classic/global/toolbar.css
skin/classic/global/toolbarbutton.css
* skin/classic/global/tree.css
-* skin/classic/global/viewbuttons.css
skin/classic/global/wizard.css
* skin/classic/global/alerts/alert.css (alerts/alert.css)
skin/classic/global/arrow/arrow-dn-dis.gif (arrow/arrow-dn-dis.gif)
skin/classic/global/arrow/arrow-dn-dis.png (arrow/arrow-dn-dis.png)
skin/classic/global/arrow/arrow-dn-sharp.gif (arrow/arrow-dn-sharp.gif)
skin/classic/global/arrow/arrow-dn.gif (arrow/arrow-dn.gif)
skin/classic/global/arrow/arrow-dn.png (arrow/arrow-dn.png)
skin/classic/global/arrow/arrow-lft-dis.gif (arrow/arrow-lft-dis.gif)
deleted file mode 100644
--- a/toolkit/themes/osx/global/viewbuttons.css
+++ /dev/null
@@ -1,36 +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/. */
-
-%include shared.inc
-
-#topBar {
- -moz-appearance: toolbar;
-}
-
-.viewGroupWrapper {
- -moz-box-align: center;
- -moz-box-pack: center;
-}
-
-#viewGroup {
- margin: 4px 0 9px;
-}
-
-#viewGroup > radio,
-#viewGroup > toolbarbutton {
- -moz-box-orient: vertical;
- -moz-box-align: center;
- -moz-appearance: toolbarbutton;
- font: menu;
- text-shadow: @loweredShadow@;
- margin: 0;
- padding: 0 1px;
- height: 22px;
-}
-
-#viewGroup > radio[selected=true],
-#viewGroup > toolbarbutton[checked=true] {
- color: #FFF !important;
- text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
-}