Bug 546261 - Full-screen window controls shouldn't pick up custom toolbarbutton styling. r=gavin

browser/base/content/browser.xul

@@ -554,15 +554,15 @@
              context="toolbar-context-menu">
       <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
       <hbox id="window-controls" hidden="true" fullscreencontrol="true">
-        <toolbarbutton id="minimize-button" class="toolbarbutton-1"
+        <toolbarbutton id="minimize-button"
                        tooltiptext="&fullScreenMinimize.tooltip;"
                        oncommand="window.minimize();"/>
 
-        <toolbarbutton id="restore-button" class="toolbarbutton-1"
+        <toolbarbutton id="restore-button"
                        tooltiptext="&fullScreenRestore.tooltip;"
                        oncommand="BrowserFullScreen();"/>
 
-        <toolbarbutton id="close-button" class="toolbarbutton-1"
+        <toolbarbutton id="close-button"
                        tooltiptext="&fullScreenClose.tooltip;"
                        oncommand="BrowserTryToCloseWindow();"/>
       </hbox>

browser/themes/pinstripe/browser/browser.css

@@ -357,6 +357,7 @@ toolbarbutton.bookmark-item-microsummarized {
 /* ----- PRIMARY TOOLBAR BUTTONS ----- */	
 
 .toolbarbutton-1,
+#restore-button,
 #back-forward-dropmarker {
   min-width: 0px;
   list-style-image: url("chrome://browser/skin/Toolbar.png");
@@ -372,7 +373,8 @@ toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-text {
   margin: 4px;
 }
 
-#nav-bar .toolbarbutton-1 {
+#nav-bar .toolbarbutton-1,
+#restore-button {
   padding-top: 0;
   padding-bottom: 0;
 }