Bug 831432 - Downloads button has no text in Text button mode.
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 07 Feb 2013 01:12:13 +0100
changeset 127447 2b43414e36c185a10d51b9ae9f8d0787e74c2117
parent 127446 9eb5289f155a82dca5201e7536f1796f1138ec93
child 127448 d0730b726ee01392636c7fbd89c56afc266dee35
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs831432
milestone20.0a2
Bug 831432 - Downloads button has no text in Text button mode. r=mconley a=gavin
browser/components/downloads/content/downloads.css
browser/components/downloads/content/indicatorOverlay.xul
browser/themes/gnomestripe/downloads/downloads.css
browser/themes/pinstripe/downloads/downloads.css
browser/themes/winstripe/downloads/downloads.css
--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -93,8 +93,26 @@ richlistitem[type="download"]:not([selec
 
 #downloadsSummary:not([inprogress]) > vbox > #downloadsSummaryProgress,
 #downloadsSummary:not([inprogress]) > vbox > #downloadsSummaryDetails,
 #downloadsFooter[showingsummary] > #downloadsHistory,
 #downloadsFooter:not([showingsummary]) > #downloadsSummary
 {
   display: none;
 }
+
+/* Hacks for toolbar full and text modes, until bug 573329 removes them */
+
+toolbar[mode="text"] > #downloads-indicator {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-pack: center;
+}
+
+toolbar[mode="text"] > #downloads-indicator > .toolbarbutton-text {
+  -moz-box-ordinal-group: 1;
+}
+
+toolbar[mode="text"] > #downloads-indicator > .toolbarbutton-icon {
+  display: -moz-box;
+  -moz-box-ordinal-group: 2;
+  visibility: collapse;
+}
--- a/browser/components/downloads/content/indicatorOverlay.xul
+++ b/browser/components/downloads/content/indicatorOverlay.xul
@@ -48,11 +48,13 @@
           <progressmeter id="downloads-indicator-progress"
                          class="plain"
                          min="0"
                          max="100"/>
         </vbox>
         <vbox id="downloads-indicator-icon"/>
         <vbox id="downloads-indicator-notification"/>
       </stack>
+      <label class="toolbarbutton-text" crop="right" flex="1"
+             value="&downloads.label;"/>
     </toolbarbutton>
   </popupset>
 </overlay>
--- a/browser/themes/gnomestripe/downloads/downloads.css
+++ b/browser/themes/gnomestripe/downloads/downloads.css
@@ -343,8 +343,13 @@ toolbar[iconsize="large"] > #downloads-i
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
   background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
   background-image: linear-gradient(#4b5000, #515700);
 }
+
+toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
+  margin: 0;
+  text-align: center;
+}
--- a/browser/themes/pinstripe/downloads/downloads.css
+++ b/browser/themes/pinstripe/downloads/downloads.css
@@ -517,8 +517,15 @@ richlistitem[type="download"]:hover > st
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
   background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
   background-image: linear-gradient(#4b5000, #515700);
 }
+
+toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
+  margin: 2px 0 0;
+  padding: 0;
+  text-align: center;
+  vertical-align: middle;
+}
--- a/browser/themes/winstripe/downloads/downloads.css
+++ b/browser/themes/winstripe/downloads/downloads.css
@@ -368,8 +368,13 @@ richlistitem[type="download"]:hover > st
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar {
   background-color: rgb(220, 230, 81);
 }
 
 #downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder {
   background-image: linear-gradient(#4b5000, #515700);
 }
+
+toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text {
+  margin: 0;
+  text-align: center;
+}