Bug 688481 - Let the urlbar stretch to fill the toolbar in tablet mode [r=wesj]
authorMatt Brubeck <mbrubeck@mozilla.com>
Thu, 22 Sep 2011 11:04:46 -0700
changeset 77343 91b3c66b8356ac25ee48443ccab0073f672f0f4b
parent 77342 281f14518241ea5a3a0edd6713140a374b8293c7
child 77344 c00d66030452722b8f9adf7c5c70bdce79fa76a5
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewerswesj
bugs688481
milestone9.0a1
Bug 688481 - Let the urlbar stretch to fill the toolbar in tablet mode [r=wesj]
mobile/chrome/content/browser.xul
mobile/themes/core/defines.inc
mobile/themes/core/gingerbread/defines.inc
mobile/themes/core/honeycomb/browser.css
mobile/themes/core/honeycomb/defines.inc
mobile/themes/core/tablet.css
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -257,17 +257,16 @@
                              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 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/defines.inc
+++ b/mobile/themes/core/defines.inc
@@ -56,17 +56,17 @@
 %define textbox_height 5.08mozmm
 
 %define dropmarker_padding 0.53mozmm
 
 %define progressmeter_height 3.39mozmm
 
 %define urlbar_edit_height 6.35mozmm
 %define urlbar_edit_indent 0.85mozmm
-%define urlbar_max_width   96mozmm
+%define identity_popup_tablet_width 72mozmm
 
 %define scroller_thickness 0.64mozmm
 %define scroller_minimum 1.27mozmm
 
 %define sidebar_width_minimum 8.47mozmm
 %define sidebar_button_height 7.41mozmm
 %define documenttab_margin_bottom 0.53mozmm
 
--- a/mobile/themes/core/gingerbread/defines.inc
+++ b/mobile/themes/core/gingerbread/defines.inc
@@ -83,17 +83,17 @@
 %define textbox_height 5.08mozmm
 
 %define dropmarker_padding 0.53mozmm
 
 %define progressmeter_height 3.39mozmm
 
 %define urlbar_edit_height 6.35mozmm
 %define urlbar_edit_indent 0.85mozmm
-%define urlbar_max_width   96mozmm
+%define identity_popup_tablet_width 72mozmm
 
 %define scroller_thickness 0.64mozmm
 %define scroller_minimum 1.27mozmm
 
 %define sidebar_width_minimum 8.47mozmm
 %define sidebar_button_height 7.41mozmm
 %define documenttab_margin_bottom 0.85mozmm
 
--- a/mobile/themes/core/honeycomb/browser.css
+++ b/mobile/themes/core/honeycomb/browser.css
@@ -125,17 +125,16 @@ toolbarbutton.urlbar-button {
   list-style-image: url("chrome://browser/skin/images/task-back-rtl-hdpi.png");
 }
 %endif
 
 /* URL bar ----------------------------------------------------------------- */
 #urlbar-container {
   color: @color_text_default@;
   background-color: transparent;
-  max-width: @urlbar_max_width@;
   -moz-box-align: center;
   -moz-margin-end: @margin_xxxnormal@;
 }
 
 #urlbar-container[mode="edit"] > #identity-box {
   visibility: collapse;
 }
 
--- a/mobile/themes/core/honeycomb/defines.inc
+++ b/mobile/themes/core/honeycomb/defines.inc
@@ -98,17 +98,17 @@
 %define textbox_height 5.08mozmm
 
 %define dropmarker_padding 0.53mozmm
 
 %define progressmeter_height 3.39mozmm
 
 %define urlbar_edit_height 6.35mozmm
 %define urlbar_edit_indent 0.85mozmm
-%define urlbar_max_width   96mozmm
+%define identity_popup_tablet_width 72mozmm
 
 %define scroller_thickness 0.64mozmm
 %define scroller_minimum 1.27mozmm
 
 %define sidebar_width_minimum 8.47mozmm
 %define sidebar_button_height 7.41mozmm
 %define documenttab_margin_bottom 0.85mozmm
 
--- a/mobile/themes/core/tablet.css
+++ b/mobile/themes/core/tablet.css
@@ -1,25 +1,23 @@
 
-.spacer-actionbar,
 .button-actionbar {
   visibility: collapse;
 }
 
 .button-actionbar[disabled="true"] {
   opacity: 0.5;
 }
 
 %ifndef honeycomb
 .button-actionbar:hover:active {
   background-color: #8db8d8;
 }
 %endif
 
-#toolbar-main[tablet] > .spacer-actionbar,
 #toolbar-main[tablet] > .button-actionbar {
   visibility: visible;
 }
 #toolbar-main[tablet] > #tool-tabs {
   visibility: collapse;
 }
 
 #controls-scrollbox[tablet] > #controls-sidebar {
@@ -140,18 +138,18 @@ documenttab[selected="true"] > vbox > st
   #controls-scrollbox[tablet] > #tabs-sidebar[open] {
     position: fixed;
     visibility: visible;
   }
 }
 
 #identity-container[tablet] #identity-popup-container {
   -moz-stack-sizing: ignore;
-  max-width: -moz-calc(0.75 * @urlbar_max_width@);
-  min-width: -moz-calc(0.75 * @urlbar_max_width@);
+  max-width: @identity_popup_tablet_width@;
+  min-width: @identity_popup_tablet_width@;
 }
 
 #identity-container[tablet] pageaction {
   width: 100%;
 }
 
 arrowbox {
   -moz-stack-sizing: ignore;