Bug 776349 - Main toolbox still shown with all toolbars hidden. r=bwinton
authorRichard Marti <richard.marti@gmail.com>
Sun, 22 Jul 2012 14:44:51 +0200
changeset 10715 f91c69072cf6e5f395ccf7916629f6d50ade9cd2
parent 10714 76efc33d143a711a6a8b4000d2dcf08f4e638803
child 10716 d0c32b433ceadd1ee47643615b670f2b8ebfbea2
push id8077
push userryanvm@gmail.com
push dateMon, 23 Jul 2012 23:27:28 +0000
treeherdercomm-central@f91c69072cf6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton
bugs776349
Bug 776349 - Main toolbox still shown with all toolbars hidden. r=bwinton
mail/themes/gnomestripe/mail/mailWindow1.css
mail/themes/pinstripe/mail/mailWindow1.css
mail/themes/pinstripe/mail/primaryToolbar.css
mail/themes/qute/mail/mailWindow1-aero.css
mail/themes/qute/mail/mailWindow1.css
--- a/mail/themes/gnomestripe/mail/mailWindow1.css
+++ b/mail/themes/gnomestripe/mail/mailWindow1.css
@@ -12,19 +12,33 @@
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/tagColors.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.mail-toolbox {
-  -moz-box-pack: center;
-  min-height: 41px;
+/* give the toolbox a min-height of 41px for Australis theme */
+.mail-toolbox:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[mode="full"][labelalign="end"] > toolbar:only-of-type {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+.mail-toolbox[iconsize="large"]:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[iconsize="large"][mode="full"][labelalign="end"] >
+toolbar:only-of-type {
+  margin-top: 2px;
+  margin-bottom: 3px;
+}
+
+.mail-toolbox[mode="text"]:not([mode="full"]) > toolbar:only-of-type {
+  margin-top: 3px;
+  margin-bottom: 3px;
 }
 
 #viewPickerLabel:not(:-moz-lwtheme) {
   color: MenuText;
 }
 
 #folderTree {
   border-bottom: 1px solid ThreeDShadow;
--- a/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/mail/themes/pinstripe/mail/mailWindow1.css
@@ -12,19 +12,21 @@
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/tagColors.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.mail-toolbox {
-  -moz-box-pack: center;
-  min-height: 41px;
+/* give the toolbox a min-height of 41px for Australis theme */
+.mail-toolbox:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[mode="full"][labelalign="end"] > toolbar:only-of-type {
+  margin-top: 6px;
+  margin-bottom: 4px;
 }
 
 /* ::::::::: Global override :::::::::: */
 
 treechildren::-moz-tree-twisty {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
   -moz-margin-start: 0px !important;
--- a/mail/themes/pinstripe/mail/primaryToolbar.css
+++ b/mail/themes/pinstripe/mail/primaryToolbar.css
@@ -212,16 +212,17 @@ toolbar:not([mode="icons"]) .toolbarbutt
   width: auto;
 }
 
 toolbar[mode="icons"] .toolbarbutton-1 > menupopup {
   margin-top: 1px;
 }
 
 .mail-toolbox > toolbar {
+  -moz-appearance: none;
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 /* remove the small icons checkbox in Customize window */
 #smallicons {
   display: none;
 }
--- a/mail/themes/qute/mail/mailWindow1-aero.css
+++ b/mail/themes/qute/mail/mailWindow1-aero.css
@@ -58,16 +58,23 @@
     }
 
     #messengerWindow[sizemode="normal"] #titlebar-buttonbox {
       margin-top: -2px;
     }
   }
 }
 
+/* give the toolbox a min-height of 41px for Australis theme */
+.mail-toolbox:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[mode="full"][labelalign="end"] > toolbar:only-of-type {
+  margin-top: 6px !important;
+  margin-bottom: 6px !important;
+}
+
 #subjectCol {
   -moz-padding-start: 20px;
 }
 
 #subjectCol[primary="true"] {
   -moz-padding-start: 30px;
 }
 
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/mail/themes/qute/mail/mailWindow1.css
@@ -12,19 +12,33 @@
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/tagColors.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.mail-toolbox {
-  -moz-box-pack: center;
-  min-height: 41px;
+/* give the toolbox a min-height of 41px for Australis theme */
+.mail-toolbox:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[mode="full"][labelalign="end"] > toolbar:only-of-type {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+.mail-toolbox[iconsize="large"]:not([mode="full"]) > toolbar:only-of-type,
+.mail-toolbox[iconsize="large"][mode="full"][labelalign="end"] >
+toolbar:only-of-type {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+.mail-toolbox[mode="text"]:not([mode="full"]) > toolbar:only-of-type {
+  margin-top: 4px;
+  margin-bottom: 5px;
 }
 
 /* Don't use the listbox appearance as that gives us a blue-grey top border
    that collides with the primary toolbar border */
 #threadTree, #folderTree {
   -moz-appearance:  none;
   background-color: -moz-Field;
   color: -moz-FieldText;