Fixed toolbar button style in Thunderbird

alice-mkh · Aug 8, 2015 · b75b5e4 · b75b5e4
1 parent 86333e6
commit b75b5e4
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 9 deletions.
diff --git a/chrome/skin/pinstripe/sunbird/tbOverlay.css b/chrome/skin/pinstripe/sunbird/tbOverlay.css
@@ -32,8 +32,28 @@
   list-style-image: url("chrome://messenger/skin/icons/online.png");
 }
 
-toolbox[labelalign="end"] .cal-toolbarbutton-1,
-toolbox[labelalign="end"] .cal-toolbarbutton-1[type="menu-button"]
+.toolbarbutton-1 {
+  -moz-box-orient: vertical;
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1,
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal !important;
+  -moz-box-orient: horizontal;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
+  -moz-padding-start: 2px;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
+  text-align: start;
+}
+
+.toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
 }
diff --git a/chrome/skin/winstripe-aero/sunbird/tbOverlay.css b/chrome/skin/winstripe-aero/sunbird/tbOverlay.css
@@ -33,8 +33,28 @@
   list-style-image: url("chrome://messenger/skin/icons/online.png");
 }
 
-toolbox[labelalign="end"] .cal-toolbarbutton-1,
-toolbox[labelalign="end"] .cal-toolbarbutton-1[type="menu-button"]
+.toolbarbutton-1 {
+  -moz-box-orient: vertical;
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1,
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal !important;
+  -moz-box-orient: horizontal;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
+  -moz-padding-start: 2px;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
+  text-align: start;
+}
+
+.toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
 }
diff --git a/chrome/skin/winstripe/sunbird/tbOverlay.css b/chrome/skin/winstripe/sunbird/tbOverlay.css
@@ -33,8 +33,28 @@
   list-style-image: url("chrome://messenger/skin/icons/online.png");
 }
 
-toolbox[labelalign="end"] .cal-toolbarbutton-1,
-toolbox[labelalign="end"] .cal-toolbarbutton-1[type="menu-button"]
+.toolbarbutton-1 {
+  -moz-box-orient: vertical;
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1,
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu-button"]
   > .toolbarbutton-menubutton-button {
-  -moz-box-orient: horizontal !important;
+  -moz-box-orient: horizontal;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] .toolbarbutton-1 .toolbarbutton-text {
+  -moz-padding-start: 2px;
+}
+
+toolbox[labelalign="end"] > toolbar[mode="full"] deck .toolbarbutton-text {
+  text-align: start;
+}
+
+.toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
+}
+
+toolbox[labelalign="end"] .toolbarbutton-1[type="menu"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu");
 }