171013 - fix and hookup toolbars as text/icons/both in modern. r=varga, sr=jag

themes/modern/communicator/brand.css

@@ -68,9 +68,13 @@
   background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif") #B1BDC9 repeat-x top;
 }
 
+#navigator-throbber[buttonstyle="pictures"] {
+  margin: 4px 8px 2px 8px;
+}
+
 #navigator-throbber[buttonstyle="text"],
 #navigator-throbber[toolbarmode="small"] {
-  margin: 0 5px;
+  margin: 2px 4px 2px 6px;
   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 

themes/modern/communicator/button.css

@@ -82,6 +82,10 @@
   display: none;
 }
 
+.toolbarbutton-1[buttonstyle="text"] {
+  min-width: 46px;
+}
+
 .toolbarbutton-text[buttonstyle="pictures"],
 .toolbarbutton-icon[buttonstyle="text"] {
   display: none;

themes/modern/communicator/toolbar.css

@@ -73,6 +73,16 @@
   display: none;
 }
 
+.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+  margin: 0px 2px 0px 38px !important;
+}
+
+.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
+  > .toolbarbutton-text,
+.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-text {
+  margin: 5px 0px !important;
+}
+
 /* ::::: toolbargrippy ::::: */
  
 .toolbar-primary-grippy { 
@@ -113,4 +123,3 @@
   width: 18px;
   background: none;
 }
-

themes/modern/messenger/primaryToolbar.css

@@ -71,6 +71,10 @@
   -moz-image-region: rect(102px 199px 135px 150px) !important;
 } 
 
+#button-getmsg[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+  margin: 0px 2px 0px 55px !important;
+}
+
 #button-newmsg {
   -moz-image-region: rect(170px 49px 203px 0);
 }
@@ -264,6 +268,7 @@
   background-color: #C7BC8F;
 }
 
+
 #junkIcon {
   list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
 }

themes/modern/navigator/navigator.css

@@ -146,7 +146,6 @@ toolbox {
   display: -moz-box;
 }
 
-/* Hides text below the above buttons */
 .toolbarbutton-1 > stack > .toolbarbutton-menubutton-button 
   > .toolbarbutton-text,
 .toolbarbutton-1 > .toolbarbutton-text {
@@ -159,6 +158,23 @@ toolbox {
   display: inline !important;
 }
 
+#forward-button[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+  margin: 0px 2px 0px 56px !important;
+}
+
+.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
+  > .toolbarbutton-text,
+.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-text {
+  display: -moz-box !important;
+  margin-top: 10px !important;
+}
+
+.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
+  > .toolbarbutton-icon,
+.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-icon {
+  display: none !important;
+}
+
 /* ::::: small primary toolbar buttons ::::: */
 
 .toolbarbutton-1[toolbarmode="small"] {
@@ -374,6 +390,23 @@ toolbox {
   min-width: 0px;
 }
 
+#nav-bar-inner[buttonstyle="text"] {  
+  margin: 2px 0px 2px 5px;
+  border: 0px;
+}
+
+#search-button[buttonstyle="text"] {
+  margin-right: 0px;
+}
+
+#search-button[buttonstyle="text"] > .button-box > .button-icon {
+  display: none;
+}
+
+#search-button[buttonstyle="pictures"] > .button-box > .button-text {
+  display: none;
+}
+
 /* ::::: urlbar - the url textbox ::::: */
 
 #urlbar {

xpfe/browser/resources/content/navigator.xul

@@ -157,6 +157,7 @@ Contributor(s):
       </hbox>
  
       <hbox id="nav-bar-inner" flex="1">
+        <observes element="nav-bar" attribute="buttonstyle"/>
         <textbox id="urlbar" class="chromeclass-location uri-element" flex="1"
                  type="autocomplete" searchSessions="history" 
                  timeout="50" maxrows="6" alwaysopenpopup="true"