Bug 679472 - Hide actionbar spacer in non-tablet theme [r=wesj]
authorMatt Brubeck <mbrubeck@mozilla.com>
Thu, 25 Aug 2011 13:00:06 -0700
changeset 75913 9f11fc87eaa69990a8230420035e85dd737b44bc
parent 75912 40eedacb461c4c4261ea7f7b4b20fd9d1375a2f8
child 75914 e87454393401329dd39dec6dc9526f4fc7f2c47a
child 75917 1f86f6af9434b4d9afe3eb0998f7f9f8c1149ac3
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewerswesj
bugs679472
milestone9.0a1
Bug 679472 - Hide actionbar spacer in non-tablet theme [r=wesj]
mobile/chrome/content/browser.xul
mobile/themes/core/browser.css
mobile/themes/core/gingerbread/browser.css
mobile/themes/core/honeycomb/browser.css
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -257,17 +257,17 @@
                              clickSelectsAll="true"/>
                     <hbox id="urlbar-icons" class="urlbar-cap-button" observes="bcast_urlbarState">
                       <toolbarbutton id="tool-reload" oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
                       <toolbarbutton id="tool-stop" command="cmd_stop"/>
                       <toolbarbutton id="tool-search" command="cmd_opensearch"/>
                     </hbox>
                   </hbox>
                   <toolbarbutton id="tool-star2" class="tool-star button-actionbar" command="cmd_star"/>
-                  <spacer flex="1"/>
+                  <spacer class="spacer-actionbar" flex="1"/>
                   <toolbarbutton id="tool-menu" class="button-actionbar" command="cmd_menu"/>
 #ifndef ANDROID
                   <toolbarbutton id="tool-app-close" class="urlbar-button" command="cmd_close"/>
 #endif
                 </toolbar>
               </box>
             </box>
 
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -1573,28 +1573,30 @@ setting {
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
 /* Tablet mode */
 
+.spacer-actionbar,
 .button-actionbar {
   visibility: collapse;
 }
 
 .button-actionbar[disabled="true"] {
   opacity: 0.5;
 }
 
 .button-actionbar:hover:active {
   background-color: #8db8d8;
 }
 
+#toolbar-main[tablet="true"] > .spacer-actionbar,
 #toolbar-main[tablet="true"] > .button-actionbar {
   visibility: visible;
 }
 #toolbar-main[tablet="true"][mode="edit"] > .button-actionbar {
   visibility: collapse;
 }
 
 #controls-scrollbox[tablet="true"] > #controls-sidebar {
--- a/mobile/themes/core/gingerbread/browser.css
+++ b/mobile/themes/core/gingerbread/browser.css
@@ -1539,28 +1539,30 @@ setting {
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
 /* Tablet mode */
 
+.spacer-actionbar,
 .button-actionbar {
   visibility: collapse;
 }
 
 .button-actionbar[disabled="true"] {
   opacity: 0.5;
 }
 
 .button-actionbar:hover:active {
   background-color: #8db8d8;
 }
 
+#toolbar-main[tablet="true"] > .spacer-actionbar,
 #toolbar-main[tablet="true"] > .button-actionbar {
   visibility: visible;
 }
 #toolbar-main[tablet="true"][mode="edit"] > .button-actionbar {
   visibility: collapse;
 }
 
 #controls-scrollbox[tablet="true"] > #controls-sidebar {
--- a/mobile/themes/core/honeycomb/browser.css
+++ b/mobile/themes/core/honeycomb/browser.css
@@ -1581,24 +1581,26 @@ setting {
   45% { -moz-transform: translateX(-moz-calc(-121px - @border_width_large@ - 2*@padding_normal@)); }
   55% { -moz-transform: translateX(@sidebar_width_minimum@); }
   90% { -moz-transform: translateX(@sidebar_width_minimum@); }
   to { -moz-transform: translateX(0); }
 }
 
 /* Tablet mode */
 
+.spacer-actionbar,
 .button-actionbar {
   visibility: collapse;
 }
 
 .button-actionbar[disabled="true"] {
   opacity: 0.5;
 }
 
+#toolbar-main[tablet="true"] > .spacer-actionbar,
 #toolbar-main[tablet="true"] > .button-actionbar {
   visibility: visible;
 }
 
 #controls-scrollbox[tablet="true"] > #controls-sidebar {
   visibility: collapse;
 }