Move statusbar button stylings into browser.css

2 files changed, 42 insertions, 23 deletions

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 79437b819..15a1cc2ca 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -2118,6 +2118,48 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   font-size: 120%;
 }
 
+/* Status bar options button */
+
+#status4evar-options-button {
+  list-style-image: url("chrome://browser/skin/statusbar/pms24.png");
+}
+
+toolbar[iconsize="small"] #status4evar-options-button {
+  list-style-image: url("chrome://browser/skin/statusbar/pms16.png");
+}
+
+/* Status bar download status button */
+
+#status4evar-download-button[attention] #status4evar-download-icon {
+  background-image: url("chrome://browser/skin/downloads/download-glow.png");
+}
+
+#status4evar-download-button #status4evar-download-icon {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 24, 24, 0) center no-repeat;
+  min-width: 24px;
+  min-height: 24px;
+}
+
+toolbar[iconsize="small"] #status4evar-download-button #status4evar-download-icon {
+  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-small.png"), 0, 16, 16, 0) center no-repeat;
+  min-width: 16px;
+  min-height: 16px;
+}
+
+toolbar[iconsize="small"] > #status4evar-download-button[attention] #status4evar-download-icon {
+  background-image: url("chrome://browser/skin/downloads/download-glow-small.png");
+}
+
+#wrapper-status4evar-progress-widget progressmeter,
+#wrapper-status4evar-download-button toolbarbutton {
+  visibility: visible;
+}
+
+#wrapper-status4evar-status-widget toolbaritem label {
+  background-color: rgba(0,0,0,0.2);
+  padding: 2px 4px;
+}
+
 %ifdef MOZ_DEVTOOLS
 %include ../shared/devtools/responsivedesign.inc.css
 %include ../shared/devtools/commandline.inc.css
diff --git a/browser/themes/linux/statusbar/overlay.css b/browser/themes/linux/statusbar/overlay.css
index 2351aac4c..a95dd225c 100644
--- a/browser/themes/linux/statusbar/overlay.css
+++ b/browser/themes/linux/statusbar/overlay.css
@@ -30,29 +30,6 @@ toolbar[iconsize="small"] #status4evar-download-progress-bar
 	height: 4px;
 }
 
-#status4evar-download-button[attention] #status4evar-download-icon
-{
-	background-image: url("chrome://browser/skin/downloads/download-glow.png");
-}
-
-#status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 24, 24, 0) center no-repeat;
-	min-width: 24px;
-	min-height: 24px;
-}
-
-toolbar[iconsize="small"] #status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar-small.png"), 0, 16, 16, 0) center no-repeat;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-toolbar[iconsize="small"] > #status4evar-download-button[attention] #status4evar-download-icon {
-	background-image: url("chrome://browser/skin/downloads/download-glow-small.png");
-}
-
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
 	margin: 0px 2px !important;