Bug 514833 - Enforce icon-only fullscreen controls even in text-only mode. r=dao

--HG--
extra : rebase_source : 0b8ee14caf05284986e4e9d95e24cd2a49891f52

browser/base/content/browser.css

@@ -126,15 +126,20 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   display: none;
 }
 
-/* ::::: Fullscreen pseudo-toolbar ::::: */
+/*  Full Screen UI */
 #fullscr-toggler {
   display: none;
   min-height: 5px;
   height: 5px;
 }
 
-#navigator-toolbox[inFullscreen="true"] #fullscr-toggler {
-  display: -moz-box;
+#navigator-toolbox[inFullscreen="true"] > #fullscr-toggler,
+#nav-bar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
+ display: -moz-box;
+}
+
+#nav-bar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
+ display: none;
 }
 
 /* ::::: Keyboard UI Panel ::::: */

browser/themes/gnomestripe/browser/browser.css

@@ -1321,14 +1321,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   display: -moz-box; /* display chevron icon in text mode */
 }
 
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
-  display: -moz-box;
-}
-
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
-   display: none;
-}
-
 /* Popup blocking dialog */
 #pageReportFirstTime statusbarpanel.statusbar-resizerpanel {
   visibility: collapse;

browser/themes/winstripe/browser/browser.css

@@ -1524,14 +1524,6 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   display: -moz-box; /* display chevron icon in text mode */
 }
 
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
-  display: -moz-box;
-}
-
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
-   display: none;
-}
-
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
   -moz-margin-end: 4px;