From da73257c1e9343060247f19b0b54edaf100afbb3 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 7 Feb 2013 01:12:13 +0100
Subject: [PATCH] Bug 831432 - Downloads button has no text in Text button
 mode. r=mconley

---
 .../components/downloads/content/downloads.css | 18 ++++++++++++++++++
 .../downloads/content/indicatorOverlay.xul     |  2 ++
 .../themes/gnomestripe/downloads/downloads.css |  5 +++++
 .../themes/pinstripe/downloads/downloads.css   |  7 +++++++
 .../themes/winstripe/downloads/downloads.css   |  5 +++++
 5 files changed, 37 insertions(+)

diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css
index 0b73af8a153..874f0e65d90 100644
--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -98,3 +98,21 @@ richlistitem[type="download"]:not([selected]) button {
 {
   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;
+}
diff --git a/browser/components/downloads/content/indicatorOverlay.xul b/browser/components/downloads/content/indicatorOverlay.xul
index 05defb37fde..efb6cab7573 100644
--- a/browser/components/downloads/content/indicatorOverlay.xul
+++ b/browser/components/downloads/content/indicatorOverlay.xul
@@ -53,6 +53,8 @@
         <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>
diff --git a/browser/themes/gnomestripe/downloads/downloads.css b/browser/themes/gnomestripe/downloads/downloads.css
index 86ce09f5871..bb597a8916f 100644
--- a/browser/themes/gnomestripe/downloads/downloads.css
+++ b/browser/themes/gnomestripe/downloads/downloads.css
@@ -355,3 +355,8 @@ toolbar[iconsize="large"] > #downloads-indicator[attention] > #downloads-indicat
 #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;
+}
diff --git a/browser/themes/pinstripe/downloads/downloads.css b/browser/themes/pinstripe/downloads/downloads.css
index 574eb51c11f..9a8f0620ed6 100644
--- a/browser/themes/pinstripe/downloads/downloads.css
+++ b/browser/themes/pinstripe/downloads/downloads.css
@@ -528,3 +528,10 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 #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;
+}
diff --git a/browser/themes/winstripe/downloads/downloads.css b/browser/themes/winstripe/downloads/downloads.css
index 886935c146b..466f6edeca6 100644
--- a/browser/themes/winstripe/downloads/downloads.css
+++ b/browser/themes/winstripe/downloads/downloads.css
@@ -379,3 +379,8 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 #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;
+}