Statusbar: Prune redundant Australis support

4 files changed, 18 insertions, 72 deletions

diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index f0a698624..52806c468 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -102,9 +102,7 @@ browser.jar:
 * skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
-* skin/classic/browser/statusbar/australis.css                 (statusbar/australis.css)
   skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
-* skin/classic/browser/statusbar/legacy.css                    (statusbar/legacy.css)
 * skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
 * skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
   skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
diff --git a/browser/themes/linux/statusbar/australis.css b/browser/themes/linux/statusbar/australis.css
deleted file mode 100644
index d44fda7b0..000000000
--- a/browser/themes/linux/statusbar/australis.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/statusbar/australis.css
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#status4evar-status-bar
-{
-	box-shadow: 0 1px 0 rgba(0,0,0,.15) inset;
-	padding: 0;
-	min-height: 20px;
-}
-
-#status4evar-status-bar .toolbarbutton-1,
-#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button
-{
-	-moz-appearance: none;
-	border-style: none;
-	padding: 0 3px;
-}
-
-#status4evar-status-bar .toolbarbutton-1:not([disabled]):hover,
-#status4evar-status-bar .toolbarbutton-1[open],
-#status4evar-status-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover
-{
-	background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
-	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
-	                  linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
-	background-position: left, left, right;
-	background-size: auto, 1px 100%, 1px 100%;
-	background-repeat: no-repeat;
-}
-
-#status4evar-download-button #status4evar-download-icon
-{
-	background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"), 0, 198, 18, 180) center no-repeat;
-	min-width: 18px;
-	min-height: 18px;
-}
-
diff --git a/browser/themes/linux/statusbar/legacy.css b/browser/themes/linux/statusbar/legacy.css
deleted file mode 100644
index 00626f5f9..000000000
--- a/browser/themes/linux/statusbar/legacy.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-%include ../../shared/statusbar/legacy.css
-
-#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");
-}
-
diff --git a/browser/themes/linux/statusbar/overlay.css b/browser/themes/linux/statusbar/overlay.css
index 49f8860be..2351aac4c 100644
--- a/browser/themes/linux/statusbar/overlay.css
+++ b/browser/themes/linux/statusbar/overlay.css
@@ -35,6 +35,24 @@ toolbar[iconsize="small"] #status4evar-download-progress-bar
 	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;