Bug 456214 - Polish toolbar buttons in the Add-ons Manager, Page Info dialog and Error Console, r=dao

browser/base/content/pageinfo/pageInfo.xul

@@ -48,6 +48,8 @@
 <!DOCTYPE window [
   <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
   %pageInfoDTD;
+  <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
+  %global;
 ]>
 
 #ifdef XP_MACOSX
@@ -114,7 +116,8 @@
 
   <windowdragbox orient="vertical">
     <stack id="topStackBar">
-      <radiogroup id="viewGroup" class="viewSelector chromeclass-toolbar" orient="horizontal">
+      <radiogroup id="viewGroup" class="viewSelector chromeclass-toolbar" orient="horizontal"
+                  chromedir="&locale.dir;">
         <radio id="generalTab"  label="&generalTab;"  accesskey="&generalTab.accesskey;"
              oncommand="showTab('general');"/>
         <radio id="mediaTab"    label="&mediaTab;"    accesskey="&mediaTab.accesskey;"

browser/themes/pinstripe/browser/pageInfo.css

@@ -39,35 +39,8 @@
 
 @import "chrome://global/skin/";
 
-#main-window:not([active="true"]) > #topStackBar > #viewGroup {
-  opacity: 0.7;
-}
-
-#topStackBar {
-  display: -moz-box;
-  -moz-appearance: -moz-mac-unified-toolbar;
-  padding: 4px 0 8px;
-  -moz-box-pack: center;
-}
-
 /* View buttons */
-
-#viewGroup {
-  border: 1px solid #404040;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: #C2C2C2 #404040;
-  -moz-border-radius: 4px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-bottomleft: 5px;
-  background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
-  background-repeat: repeat-x;
-}
-
-#viewGroup radio {
-  -moz-box-orient: vertical;
-  -moz-box-align: center;
-  -moz-appearance: none;
-}
+@import "chrome://global/skin/viewbuttons.css";
 
 /* Extensions will provide icons because the view buttons have icons
    on the winstripe and gnomestripe themes. We don't want to display them */

toolkit/components/console/content/console.xul

@@ -95,18 +95,20 @@
   
   <toolbox id="console-toolbox" chromedir="&locale.dir;">
     <toolbar class="chromeclass-toolbar" id="ToolbarMode">
-      <toolbarbutton type="radio" group="mode" id="Console:modeAll" 
-                     label="&all.label;" accesskey="&all.accesskey;"
-                     oncommand="changeMode('All');"/>
-      <toolbarbutton type="radio" group="mode" id="Console:modeErrors"
-                     label="&errors.label;" accesskey="&errors.accesskey;"
-                     oncommand="changeMode('Errors');"/>
-      <toolbarbutton type="radio" group="mode" id="Console:modeWarnings"
-                     label="&warnings.label;" accesskey="&warnings.accesskey;"
-                     oncommand="changeMode('Warnings');"/>
-      <toolbarbutton type="radio" group="mode" id="Console:modeMessages"
-                   label="&messages.label;" accesskey="&messages.accesskey;"
-                   oncommand="changeMode('Messages');"/>
+      <hbox id="viewGroup" chromedir="&locale.dir;">
+        <toolbarbutton type="radio" group="mode" id="Console:modeAll" 
+                       label="&all.label;" accesskey="&all.accesskey;"
+                       oncommand="changeMode('All');"/>
+        <toolbarbutton type="radio" group="mode" id="Console:modeErrors"
+                       label="&errors.label;" accesskey="&errors.accesskey;"
+                       oncommand="changeMode('Errors');"/>
+        <toolbarbutton type="radio" group="mode" id="Console:modeWarnings"
+                       label="&warnings.label;" accesskey="&warnings.accesskey;"
+                       oncommand="changeMode('Warnings');"/>
+        <toolbarbutton type="radio" group="mode" id="Console:modeMessages"
+                     label="&messages.label;" accesskey="&messages.accesskey;"
+                     oncommand="changeMode('Messages');"/>
+      </hbox>
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>

toolkit/mozapps/extensions/content/extensions.xul

@@ -48,6 +48,8 @@
 %brandDTD;
 <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
 %extensionsDTD;
+<!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
+%global;
 ]>
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -162,7 +164,8 @@
   <windowdragbox orient="vertical">
     <stack id="topStackBar">
       <radiogroup id="viewGroup" xhtml:role="listbox" persist="last-selected"
-                  class="viewSelector chromeclass-toolbar" orient="horizontal">
+                  class="viewSelector chromeclass-toolbar" orient="horizontal"
+                  chromedir="&locale.dir;">
         <radio id="search-view" label="&search.label;" oncommand="showView('search');" persist="last-selected"/>
         <radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
         <radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>

toolkit/themes/pinstripe/global/console/console.css

@@ -39,11 +39,10 @@
   == Styles used by the Error Console window.
   ======================================================================= */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+/* View buttons */
+@import "chrome://global/skin/viewbuttons.css";
 
-#JSConsoleWindow:not([active="true"]) > #console-toolbox > #ToolbarMode > toolbarbutton {
-  opacity: 0.7;
-}
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .console-box {
   background-color: -moz-Field;
@@ -188,74 +187,37 @@ toolbarseparator {
 /* Toolbar icons */
 
 #ToolbarMode {
-  background-color: #999;
-  border-bottom: 1px solid #404040;
-  background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
-  background-repeat: repeat-x;
-  background-position: top right;
   padding: 4px 0 8px;
   -moz-box-pack: center;
 }
 
-#ToolbarMode toolbarbutton {
-  border: 1px solid #404040;
-  border-bottom-width: 2px;
-  -moz-border-start-width: 0px;
-  -moz-border-bottom-colors: #C2C2C2 #404040;
-  background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
-  background-repeat: repeat-x;
-  font: menu;
-  margin: 0;
-  padding: 0 4px;
+#ToolbarMode toolbarbutton > .toolbarbutton-icon {
+  display: none;
 }
 
-toolbar#ToolbarMode toolbarbutton[checked] {
-  background-image: none;
-  background-color: #5E5E5E;
-  color: #ffffff !important;
-}
-
-#Console\:modeAll {
-  -moz-border-start-width: 1px !important;
-  -moz-border-radius-bottomleft: 5px;
-  -moz-border-radius-topleft: 4px;
-}
-
-#console-toolbox[chromedir="rtl"] > #ToolbarMode > #Console\:modeAll {
-  -moz-border-radius-bottomleft: 0;
-  -moz-border-radius-topleft: 0;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topright: 4px;
-}
-
-#Console\:modeMessages {
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topright: 4px;
-}
-
-#console-toolbox[chromedir="rtl"] > #ToolbarMode > #Console\:modeMessages {
-  -moz-border-radius-bottomright: 0;
-  -moz-border-radius-topright: 0;
-  -moz-border-radius-bottomleft: 5px;
-  -moz-border-radius-topleft: 4px;
+#viewGroup {
+  -moz-appearance: none;
+  padding: 0;
 }
 
 #Console\:clear {
-  -moz-border-start-width: 1px !important;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-bottomleft: 5px;
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  font: menu;
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+  margin: 0;
+  padding: 3px 0 0;
+  height: 24px;
+  border: solid transparent;
+  border-width: 0 6px;
+  -moz-border-image: url("chrome://global/skin/toolbar/roundrectbutton.png") 0 6 repeat !important;
 }
 
-#Console\:clear:hover:active {
-  background-image: none; 
-  background-color: #5E5E5E;
-  color: #ffffff !important;
+#Console\:clear:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/roundrectbutton-down.png") 0 6 repeat !important;
 }
 
-#ConsoleBox {
-  margin-bottom: 14px;
-  border-bottom: 1px solid #bebebe; 
+:root:not([active]) #Console\:clear {
+  color: #7C7C7C !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/roundrectbutton-inactive.png") 0 6 repeat !important;
 }
-

toolkit/themes/pinstripe/global/jar.mn

@@ -51,6 +51,7 @@ classic.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/wizardOverlay.css
 +  skin/classic/global/globalBindings.xml
@@ -206,6 +207,27 @@ classic.jar:
 +  skin/classic/global/toolbar/Lighten.png                            (toolbar/Lighten.png)
 +  skin/classic/global/toolbar/dropmark-nav.png                       (toolbar/dropmark-nav.png)
 +  skin/classic/global/toolbar/dropmark-nav-small.png                 (toolbar/dropmark-nav-small.png)
++  skin/classic/global/toolbar/roundrectbutton.png                    (toolbar/roundrectbutton.png)
++  skin/classic/global/toolbar/roundrectbutton-down.png               (toolbar/roundrectbutton-down.png)
++  skin/classic/global/toolbar/roundrectbutton-inactive.png           (toolbar/roundrectbutton-inactive.png)
++  skin/classic/global/toolbar/viewbutton-left.png                          (toolbar/viewbutton-left.png)
++  skin/classic/global/toolbar/viewbutton-left-down.png                     (toolbar/viewbutton-left-down.png)
++  skin/classic/global/toolbar/viewbutton-left-inactive.png                 (toolbar/viewbutton-left-inactive.png)
++  skin/classic/global/toolbar/viewbutton-left-selected.png                 (toolbar/viewbutton-left-selected.png)
++  skin/classic/global/toolbar/viewbutton-left-selected-down.png            (toolbar/viewbutton-left-selected-down.png)
++  skin/classic/global/toolbar/viewbutton-left-selected-inactive.png        (toolbar/viewbutton-left-selected-inactive.png)
++  skin/classic/global/toolbar/viewbutton-middle.png                        (toolbar/viewbutton-middle.png)
++  skin/classic/global/toolbar/viewbutton-middle-down.png                   (toolbar/viewbutton-middle-down.png)
++  skin/classic/global/toolbar/viewbutton-middle-inactive.png               (toolbar/viewbutton-middle-inactive.png)
++  skin/classic/global/toolbar/viewbutton-middle-selected.png               (toolbar/viewbutton-middle-selected.png)
++  skin/classic/global/toolbar/viewbutton-middle-selected-down.png          (toolbar/viewbutton-middle-selected-down.png)
++  skin/classic/global/toolbar/viewbutton-middle-selected-inactive.png      (toolbar/viewbutton-middle-selected-inactive.png)
++  skin/classic/global/toolbar/viewbutton-right.png                         (toolbar/viewbutton-right.png)
++  skin/classic/global/toolbar/viewbutton-right-down.png                    (toolbar/viewbutton-right-down.png)
++  skin/classic/global/toolbar/viewbutton-right-inactive.png                (toolbar/viewbutton-right-inactive.png)
++  skin/classic/global/toolbar/viewbutton-right-selected.png                (toolbar/viewbutton-right-selected.png)
++  skin/classic/global/toolbar/viewbutton-right-selected-down.png           (toolbar/viewbutton-right-selected-down.png)
++  skin/classic/global/toolbar/viewbutton-right-selected-inactive.png       (toolbar/viewbutton-right-selected-inactive.png)
 +  skin/classic/global/toolbar/spring.gif                             (toolbar/spring.gif)
 +  skin/classic/global/toolbar/toolbar-background.gif                 (toolbar/toolbar-background.gif)
 +  skin/classic/global/toolbar/toolbar-background-inactive.png        (toolbar/toolbar-background-inactive.png)

toolkit/themes/pinstripe/global/viewbuttons.css

@@ -0,0 +1,195 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the nsSessionStore component.
+ *
+ * The Initial Developer of the Original Code is
+ * Markus Stange <mstange@themasta.com>
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#viewGroup {
+  -moz-appearance: -moz-mac-unified-toolbar;
+  padding: 4px 0 8px;
+  margin: 0;
+  -moz-box-pack: center;
+}
+
+#viewGroup > * {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-appearance: none;
+  font: menu;
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px;
+  margin: 0;
+  padding: 3px 0 0;
+  height: 24px;
+  background-color: transparent;
+  border: solid transparent;
+  border-width: 0 4px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle.png") 0 4 0 5 repeat;
+}
+
+#viewGroup > :active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-down.png") 0 4 0 5 repeat;
+}
+
+#viewGroup > radio[selected=true],
+#viewGroup > toolbarbutton[checked=true] {
+  color: #FFF !important;
+  text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected.png") 0 4 0 5 repeat;
+}
+
+#viewGroup > radio[selected=true]:active:hover,
+#viewGroup > toolbarbutton[checked=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-down.png") 0 4 0 5 repeat;
+}
+
+:root:not([active]) #viewGroup > * {
+  color: #7C7C7C !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-inactive.png") 0 4 0 5 repeat;
+}
+
+:root:not([active]) #viewGroup > radio[selected=true],
+:root:not([active]) #viewGroup > toolbarbutton[checked=true] {
+  color: #C5C5C5 !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat;
+}
+
+#viewGroup > :first-child,
+#viewGroup > [first-visible],
+#viewGroup[chromedir=rtl] > :last-child,
+#viewGroup[chromedir=rtl] > [last-visible] {
+  border-width: 0 4px 0 6px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left.png") 0 4 0 6 repeat;
+}
+
+#viewGroup > :first-child:active:hover,
+#viewGroup > [first-visible]:active:hover,
+#viewGroup[chromedir=rtl] > :last-child:active:hover,
+#viewGroup[chromedir=rtl] > [last-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-down.png") 0 4 0 6 repeat;
+}
+
+#viewGroup > radio:first-child[selected=true],
+#viewGroup > radio[first-visible][selected=true],
+#viewGroup[chromedir=rtl] > radio:last-child[selected=true],
+#viewGroup[chromedir=rtl] > radio[last-visible][selected=true],
+#viewGroup > toolbarbutton:first-child[checked=true],
+#viewGroup > toolbarbutton[first-visible][checked=true],
+#viewGroup[chromedir=rtl] > toolbarbutton:last-child[checked=true],
+#viewGroup[chromedir=rtl] > toolbarbutton[last-visible][checked=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected.png") 0 4 0 6 repeat;
+}
+
+#viewGroup > radio:first-child[selected=true]:active:hover,
+#viewGroup > radio[first-visible][selected=true]:active:hover,
+#viewGroup[chromedir=rtl] > radio:last-child[selected=true]:active:hover,
+#viewGroup[chromedir=rtl] > radio[last-visible][selected=true]:active:hover,
+#viewGroup > toolbarbutton:first-child[checked=true]:active:hover,
+#viewGroup > toolbarbutton[first-visible][checked=true]:active:hover,
+#viewGroup[chromedir=rtl] > toolbarbutton:last-child[checked=true]:active:hover,
+#viewGroup[chromedir=rtl] > toolbarbutton[last-visible][checked=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-down.png") 0 4 0 6 repeat;
+}
+
+:root:not([active]) #viewGroup > :first-child,
+:root:not([active]) #viewGroup > [first-visible],
+:root:not([active]) #viewGroup[chromedir=rtl] > :last-child,
+:root:not([active]) #viewGroup[chromedir=rtl] > [last-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-inactive.png") 0 4 0 6 repeat;
+}
+
+:root:not([active]) #viewGroup > radio:first-child[selected=true],
+:root:not([active]) #viewGroup > radio[first-visible][selected=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > radio:last-child[selected=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > radio[last-visible][selected=true],
+:root:not([active]) #viewGroup > toolbarbutton:first-child[checked=true],
+:root:not([active]) #viewGroup > toolbarbutton[first-visible][checked=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > toolbarbutton:last-child[checked=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > toolbarbutton[last-visible][checked=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat;
+}
+
+#viewGroup > :last-child,
+#viewGroup > [last-visible],
+#viewGroup[chromedir=rtl] > :first-child,
+#viewGroup[chromedir=rtl] > [first-visible] {
+  border-width: 0 6px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right.png") 0 6 0 5 repeat;
+}
+
+#viewGroup > :last-child:active:hover,
+#viewGroup > [last-visible]:active:hover,
+#viewGroup[chromedir=rtl] > :first-child:active:hover,
+#viewGroup[chromedir=rtl] > [first-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-down.png") 0 6 0 5 repeat;
+}
+
+#viewGroup > radio:last-child[selected=true],
+#viewGroup > radio[last-visible][selected=true],
+#viewGroup[chromedir=rtl] > radio:first-child[selected=true],
+#viewGroup[chromedir=rtl] > radio[first-visible][selected=true],
+#viewGroup > toolbarbutton:last-child[checked=true],
+#viewGroup > toolbarbutton[last-visible][checked=true],
+#viewGroup[chromedir=rtl] > toolbarbutton:first-child[checked=true],
+#viewGroup[chromedir=rtl] > toolbarbutton[first-visible][checked=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected.png") 0 6 0 5 repeat;
+}
+
+#viewGroup > radio:last-child[selected=true]:active:hover,
+#viewGroup > radio[last-visible][selected=true]:active:hover,
+#viewGroup[chromedir=rtl] > radio:first-child[selected=true]:active:hover,
+#viewGroup[chromedir=rtl] > radio[first-visible][selected=true]:active:hover,
+#viewGroup > toolbarbutton:last-child[checked=true]:active:hover,
+#viewGroup > toolbarbutton[last-visible][checked=true]:active:hover,
+#viewGroup[chromedir=rtl] > toolbarbutton:first-child[checked=true]:active:hover,
+#viewGroup[chromedir=rtl] > toolbarbutton[first-visible][checked=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-down.png") 0 6 0 5 repeat;
+}
+
+:root:not([active]) #viewGroup > :last-child,
+:root:not([active]) #viewGroup > [last-visible],
+:root:not([active]) #viewGroup[chromedir=rtl] > :first-child,
+:root:not([active]) #viewGroup[chromedir=rtl] > [first-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-inactive.png") 0 6 0 5 repeat;
+}
+
+:root:not([active]) #viewGroup > radio:last-child[selected=true],
+:root:not([active]) #viewGroup > radio[last-visible][selected=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > radio:first-child[selected=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > radio[first-visible][selected=true],
+:root:not([active]) #viewGroup > toolbarbutton:last-child[checked=true],
+:root:not([active]) #viewGroup > toolbarbutton[last-visible][checked=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > toolbarbutton:first-child[checked=true],
+:root:not([active]) #viewGroup[chromedir=rtl] > toolbarbutton[first-visible][checked=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat;
+}
+

toolkit/themes/pinstripe/mozapps/extensions/extensions.css

@@ -1,6 +1,5 @@
-#extensionsManager:not([active="true"]) > #topStackBar > #viewGroup > .radiogroupWrapper {
-  opacity: 0.7;
-}
+/* View buttons */
+@import "chrome://global/skin/viewbuttons.css";
 
 #extensionsBox {
   padding: 0;
@@ -357,54 +356,13 @@ vbox[typeName="status"][type="header-recommended"] {
 
 #progressBox {
   padding: 5px 5px 5px 5px;
+  -moz-appearance: -moz-mac-unified-toolbar;
 }
 
 #progressBox > hbox {
   -moz-box-align: center;
 }
 
-/* View buttons */
-.viewSelector {
-  -moz-appearance: -moz-mac-unified-toolbar;
-  padding: 4px 0 8px;
-  margin: 0;
-  -moz-box-pack: center;
-}
-
-#viewGroup {
-  -moz-binding: url("chrome://mozapps/skin/extensions/extensions.xml#radiogroupWrapper");
-}
-
-.radiogroupWrapper {
-  border: 1px solid #404040;
-  border-bottom-width: 2px;
-  -moz-border-bottom-colors: #C2C2C2 #404040;
-  -moz-border-radius: 4px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-bottomleft: 5px;
-  background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
-  background-repeat: repeat-x;
-}
-
-
-#viewGroup radio {
-  padding: 0px 4px;
-  margin: 0;
-  -moz-appearance: none !important;
-  font: menu;
-  -moz-border-start: 1px solid #404040;
-}
-
-#viewGroup radio:first-child {
-  -moz-border-start: none;
-}
-
-
-#viewGroup radio[selected="true"] {
-  background-color: #5E5E5E;
-  color: #ffffff !important;
-}
-
 /* Update view checkbox */
 .includeUpdate {
   -moz-user-focus: none;

toolkit/themes/pinstripe/mozapps/extensions/extensions.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="extensionsBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-
-    <binding id="radiogroupWrapper" extends="chrome://global/content/bindings/radio.xml#radiogroup">
-    <content>
-      <xul:box class="radiogroupWrapper">
-        <children/>
-      </xul:box>
-    </content>
-    </binding>
-</bindings>

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -15,7 +15,6 @@ classic.jar:
   skin/classic/mozapps/extensions/extensionIcons.png              (extensions/extensionIcons.png)
   skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
   skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
-  skin/classic/mozapps/extensions/extensions.xml                  (extensions/extensions.xml)
   skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)