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

--HG--
extra : rebase_source : 2c839eb5a405bc8572626e33b499e96122f5ff4b

browser/themes/osx/jar.mn

@@ -17,7 +17,7 @@ browser.jar:
   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

browser/themes/osx/pageInfo.css

@@ -4,8 +4,38 @@
 
 @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;

toolkit/themes/osx/global/jar.mn

@@ -41,7 +41,6 @@ toolkit.jar:
   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)

toolkit/themes/osx/global/viewbuttons.css

@@ -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;
-}