From 56cee5aa038a3b5cc2839d082a1499b76480053f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 8 Mar 2009 20:05:53 +0100
Subject: [PATCH] Bug 479899 - Remove id selector usage from toolkit themes.
 r=enn

---
 browser/base/content/tabbrowser.xml           |  1 +
 toolkit/content/widgets/browser.xml           |  2 +-
 toolkit/themes/gnomestripe/global/global.css  |  6 ++---
 toolkit/themes/pinstripe/global/global.css    | 24 +++----------------
 .../themes/pinstripe/global/progressmeter.css | 24 -------------------
 toolkit/themes/winstripe/global/global.css    |  6 ++---
 6 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 182ec8e01029..4a99a7d2d8d2 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2769,6 +2769,7 @@
 
           // set up the shared autoscroll popup
           this._autoScrollPopup = this.mCurrentBrowser._createAutoScrollPopup();
+          this._autoScrollPopup.id = "autoscroller";
           this.appendChild(this._autoScrollPopup);
           this.mCurrentBrowser.setAttribute("autoscrollpopup", this._autoScrollPopup.id);
         ]]>
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index 28df972701e6..ab4623d97576 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -773,7 +773,7 @@
           <![CDATA[
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
             var popup = document.createElementNS(XUL_NS, "popup");
-            popup.id = "autoscroller";
+            popup.className = "autoscroller";
             return popup;
           ]]>
         </body>
diff --git a/toolkit/themes/gnomestripe/global/global.css b/toolkit/themes/gnomestripe/global/global.css
index 9336d0207d6c..72c938593136 100644
--- a/toolkit/themes/gnomestripe/global/global.css
+++ b/toolkit/themes/gnomestripe/global/global.css
@@ -307,7 +307,7 @@ label[disabled="true"] {
 
 /* :::::: autoscroll popup ::::: */
 
-#autoscroller {
+.autoscroller {
   height: 28px;
   width: 28px;
   border: none;
@@ -319,10 +319,10 @@ label[disabled="true"] {
   -moz-appearance: none;
 }
 
-#autoscroller[scrolldir="NS"] {
+.autoscroller[scrolldir="NS"] {
   background-position: center center;
 }
 
-#autoscroller[scrolldir="EW"] {
+.autoscroller[scrolldir="EW"] {
   background-position: center bottom;
 }
diff --git a/toolkit/themes/pinstripe/global/global.css b/toolkit/themes/pinstripe/global/global.css
index b6b7055a84bb..e6a24c79b40f 100644
--- a/toolkit/themes/pinstripe/global/global.css
+++ b/toolkit/themes/pinstripe/global/global.css
@@ -311,27 +311,9 @@ notification > button:hover:active {
   background-image: url("chrome://global/skin/icons/white-gray-gradient-active.gif");
 }
 
-/* ::::: XXX - stuff that should live elsewhere ::::: */
-
-/* embedding/components/ui/progressDlg/nsProgressDialog.xul */
-#ok, #cancel, #launch, #reveal, #pauseResume {
-	font: menu !important;
-}
-
-/* toolkit/content/widgets/optionsDialog.xml */
-#panelFrame {
-  margin-top: 2px;
-  -moz-padding-start: 10px;
-}
-
-/* toolkit/mozapps/preferences/ocsp.xul */
-#OCSPDialog {
-  font: message-box;
-}
-
 /* :::::: autoscroll popup ::::: */
 
-#autoscroller {
+.autoscroller {
   height: 28px;
   width: 28px;
   border: none;
@@ -344,10 +326,10 @@ notification > button:hover:active {
   -moz-window-shadow: none;
 }
 
-#autoscroller[scrolldir="NS"] {
+.autoscroller[scrolldir="NS"] {
   background-position: right center;
 }
 
-#autoscroller[scrolldir="EW"] {
+.autoscroller[scrolldir="EW"] {
   background-position: right bottom;
 }
diff --git a/toolkit/themes/pinstripe/global/progressmeter.css b/toolkit/themes/pinstripe/global/progressmeter.css
index ee2dc2207b00..ed5dc019762b 100644
--- a/toolkit/themes/pinstripe/global/progressmeter.css
+++ b/toolkit/themes/pinstripe/global/progressmeter.css
@@ -51,10 +51,7 @@ progressmeter {
   height: 12px;
 }
 
-
-
 .progress-remainder[flex="100"], .progress-remainder[flex="0"] {
-
   background-image: none !important;
   -moz-appearance: none;
 }
@@ -65,24 +62,3 @@ progressmeter {
   margin: 0;
   border-width: 1px;
 }
-
-
-.progressmeter-statusbar > .progressmeter-remainder {
-}
-/* ::::: statusbar progressmeter ::::: */
-
-
-.progressmeter-statusbar[mode="determined"]  {
- margin: 0;
-  border-width: 1px;
-}
-
-
-/* :::::: download progress meter :::::::: */
-
-#progress, #progress0 {
-	  vertical-align: baseline !important;
-          -moz-appearance: progressbar;
-           border-left: 1px solid #cccccc;
-  border-right: 1px solid #cccccc;
-}
diff --git a/toolkit/themes/winstripe/global/global.css b/toolkit/themes/winstripe/global/global.css
index 6dcc41243491..5c7977459719 100644
--- a/toolkit/themes/winstripe/global/global.css
+++ b/toolkit/themes/winstripe/global/global.css
@@ -313,7 +313,7 @@ label[disabled="true"]:-moz-system-metric(windows-classic) {
 
 /* :::::: autoscroll popup ::::: */
 
-#autoscroller {
+.autoscroller {
   height: 28px;
   width: 28px;
   border: none;
@@ -327,7 +327,7 @@ label[disabled="true"]:-moz-system-metric(windows-classic) {
   -moz-appearance: none;
 }
 
-#autoscroller[scrolldir="NS"] {
+.autoscroller[scrolldir="NS"] {
 %ifdef XP_WIN
   background-position: right center;
 %else
@@ -335,7 +335,7 @@ label[disabled="true"]:-moz-system-metric(windows-classic) {
 %endif
 }
 
-#autoscroller[scrolldir="EW"] {
+.autoscroller[scrolldir="EW"] {
 %ifdef XP_WIN
   background-position: right bottom;
 %else