302066 - move SoftwareUpdate CSS style rules into Skin CSS to support skinability - this will allow 299389 to be fixed properly.

toolkit/mozapps/preferences/update.xul

@@ -44,7 +44,7 @@
 ]>
 
 <?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://mozapps/content/update/updates.css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
 
 <prefwindow id="UpdateSettingsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

toolkit/mozapps/update/content/history.xul

@@ -46,6 +46,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://mozapps/content/update/updates.css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
 
 <dialog id="history" windowtype="Update:History"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

toolkit/mozapps/update/content/incompatible.xul

@@ -46,6 +46,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://mozapps/content/update/updates.css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
 
 <dialog id="incompatible"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

toolkit/mozapps/update/content/updates.css

@@ -5,36 +5,14 @@ wizard[description=""] .wizard-header-description {
   display: none;
 }
 
-.wizard-button[dlgtype="finish"] {
-  font-weight: bold;
-}
-
 link {
   -moz-binding: url("chrome://mozapps/content/update/updates.xml#link");
   -moz-user-focus: normal;
-  color: blue;
-  border: 1px solid transparent;
   cursor: pointer;
-  text-decoration: underline !important;
-  margin-top: 1px;
-  margin-bottom: 4px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
 }
 
 link > label {
-  margin: 0px;
-  padding: 1px;
   cursor: inherit;
-  text-decoration: underline !important;
-}
-
-link:hover:active {
-  color: red;
-}
-
-link:focus {
-  border: 1px dotted black;
 }
 
 /**
@@ -43,115 +21,15 @@ link:focus {
 license {
   -moz-binding: url("chrome://mozapps/content/update/updates.xml#license");
   display: -moz-deck;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 5px;
-  -moz-appearance: listbox;
-  padding-bottom: 1px;
-}
-.loadingBox {
-  padding: 3px 5px 3px 5px;
-}
-.licenseLoadingThrobber {
-  margin-top: 3px;
-}
-.licenseLoadingThrobber[state="loading"] {
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
-}
-.licenseLoadingThrobber[state="error"] {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
 }
 
 /**
  * Update Found Page
  */
-#updatesfoundContent {
-  margin: 10px 44px 10px 44px;
-}
-
 wizard[currentpageid="updatesfound"] .wizard-buttons {
   display: none;
 }
 
-wizard[currentpageid="updatesfound"] .wizard-page-box {
-  margin: 0px;
-}
-
-#installButtons {
-  margin: 10px;
-}
-
-#moreDetails {
-  margin: 1px 5px 4px 3px;
-}
-
-#downloadNow {
-  font-weight: bold;
-}
-
-#downloadNow > .button-box {
-  padding-left: 15px;
-  padding-right: 15px;  
-}
-
-#updateForMoreInfo {
-  margin-left: 5px;
-}
-
-#updateName, #updateFinishedName {
-  font-weight: bold;
-  font-size: larger;
-}
-
-#alertImage {
-  list-style-image: url("chrome://global/skin/icons/Warning.png");
-  margin-right: 5px;
-}
-
-#incompatibleWarning {
-  background-color: InfoBackground;
-  color: InfoText;
-  border: 1px outset InfoBackground;
-  padding: 3px;
-  margin: 1px 5px 4px 5px;
-}
-
-/**
- * Downloading Page
- */
-#downloadName {
-  margin-top: 3px;
-}
-
-#downloadStatus {
-  margin-top: 6px;
-  height: 3em !important;
-}
-#downloadThrobber {
-  margin: 5px 3px 0px 5px;
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
-}
-#downloadThrobber[state="loading"] {
-  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
-}
-
-#verificationFailedIcon {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
-  margin: 5px 3px 0px 5px;
-}
-
-/**
- * Error Page
- */
-#errorReason {
-  margin-top: 1px;
-  margin-bottom: 2px;
-  -moz-margin-start: 6px !important;
-  -moz-margin-end: 5px;
-  font-weight: bold;
-}
-
 /**
  * Update History Window
  */
@@ -159,39 +37,5 @@ update {
   -moz-binding: url("chrome://mozapps/content/update/updates.xml#update");
   display: -moz-box;
   -moz-box-orient: vertical;
-  border-bottom: 1px dotted #C0C0C0;
-}
-
-.update-name {
-  font-weight: bold;
-}
-
-.update-label-column {
-  -moz-box-align: end;
-}
-
-.update-details-link {
-  margin: 0px;
-}
-
-.update-type {
-  font-weight: bold;
-  color: #990000;
-}
-
-#historyItems {
-  -moz-appearance: listbox;
-  height: 200px;
-  margin: 1px 5px 4px 5px;
-}
-
-#historyItems > scrollbox {
-  margin-bottom: 1px;
-}
-
-.updatePrefsInfo {
-  font-size: smaller;
-  margin-left: 27px;
-  margin-bottom: 10px;
 }
 

toolkit/mozapps/update/content/updates.xul

@@ -39,6 +39,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://mozapps/content/update/updates.css"?>
+<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
 
 <!DOCTYPE wizard [
 <!ENTITY % updateDTD SYSTEM "chrome://mozapps/locale/update/updates.dtd">

toolkit/mozapps/update/src/nsUpdateService.js.in

@@ -1321,7 +1321,7 @@ UpdateManager.prototype = {
     return this._activeUpdate;
   },
   set activeUpdate(activeUpdate) {
-      this._addUpdate(this._activeUpdate);
+    this._addUpdate(this._activeUpdate);
     this._activeUpdate = activeUpdate;
     if (!activeUpdate) {
       // If |activeUpdate| is null, we have updated both lists - the active list

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -33,6 +33,7 @@ classic.jar:
   skin/classic/mozapps/shared/richview.css                        (shared/richview.css)
   skin/classic/mozapps/shared/richview.xml                        (shared/richview.xml)
   skin/classic/mozapps/update/warning.gif                         (update/warning.gif)
+  skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/update/update.png                          (update/update.png)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)

toolkit/themes/pinstripe/mozapps/update/updates.css

@@ -0,0 +1,181 @@
+/**
+ * General
+ */
+.wizard-button[dlgtype="finish"] {
+  font-weight: bold;
+}
+
+link {
+  color: blue;
+  border: 1px solid transparent;
+  margin-top: 1px;
+  margin-bottom: 4px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 5px;
+  text-decoration: underline !important;
+}
+
+link > label {
+  margin: 0px;
+  padding: 1px;
+  text-decoration: underline !important;
+}
+
+link:hover:active {
+  color: red;
+}
+
+link:focus {
+  border: 1px dotted black;
+}
+
+/**
+ * License Page
+ */
+license {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+  -moz-appearance: listbox;
+  padding-bottom: 1px;
+}
+
+.loadingBox {
+  padding: 3px 5px 3px 5px;
+}
+.licenseLoadingThrobber {
+  margin-top: 3px;
+}
+.licenseLoadingThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+.licenseLoadingThrobber[state="error"] {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+/**
+ * Update Found Page
+ */
+#updatesfoundContent {
+  margin: 10px 44px 10px 44px;
+}
+
+wizard[currentpageid="updatesfound"] .wizard-page-box {
+  margin: 0px;
+}
+
+#installButtons {
+  margin: 10px;
+}
+
+#moreDetails {
+  margin: 1px 5px 4px 3px;
+}
+
+#downloadNow {
+  font-weight: bold;
+}
+
+#downloadNow > .button-box {
+  padding-left: 15px;
+  padding-right: 15px;  
+}
+
+#updateForMoreInfo {
+  margin-left: 5px;
+}
+
+#updateName, #updateFinishedName {
+  font-weight: bold;
+  font-size: larger;
+}
+
+#alertImage {
+  list-style-image: url("chrome://global/skin/icons/Warning.png");
+  margin-right: 5px;
+}
+
+#incompatibleWarning {
+  background-color: InfoBackground;
+  color: InfoText;
+  border: 1px outset InfoBackground;
+  padding: 3px;
+  margin: 1px 5px 4px 5px;
+}
+
+/**
+ * Downloading Page
+ */
+#downloadName {
+  margin-top: 3px;
+}
+
+#downloadStatus {
+  margin-top: 6px;
+  height: 3em !important;
+}
+#downloadThrobber {
+  margin: 5px 3px 0px 5px;
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
+}
+#downloadThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+
+#verificationFailedIcon {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  margin: 5px 3px 0px 5px;
+}
+
+/**
+ * Error Page
+ */
+#errorReason {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px !important;
+  -moz-margin-end: 5px;
+  font-weight: bold;
+}
+
+/**
+ * Update History Window
+ */
+update {
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.update-name {
+  font-weight: bold;
+}
+
+.update-label-column {
+  -moz-box-align: end;
+}
+
+.update-details-link {
+  margin: 0px;
+}
+
+.update-type {
+  font-weight: bold;
+  color: #990000;
+}
+
+#historyItems {
+  -moz-appearance: listbox;
+  height: 200px;
+  margin: 1px 5px 4px 5px;
+}
+
+#historyItems > scrollbox {
+  margin-bottom: 1px;
+}
+
+.updatePrefsInfo {
+  font-size: smaller;
+  margin-left: 27px;
+  margin-bottom: 10px;
+}
+

toolkit/themes/qute/mozapps/jar.mn

@@ -27,6 +27,7 @@ classic.jar:
   skin/classic/mozapps/shared/viewFader.png                         (shared/viewFader.png)
   skin/classic/mozapps/update/icon32.png                            (update/icon32.png)
   skin/classic/mozapps/update/update.png                            (update/update.png)
+  skin/classic/mozapps/update/updates.css                           (update/updates.css)
   skin/classic/mozapps/update/extensionalert.png                    (update/extensionalert.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css               (xpinstall/xpinstallConfirm.css)
   skin/classic/mozapps/xpinstall/xpinstallIcon.png                  (xpinstall/xpinstallIcon.png)

toolkit/themes/qute/mozapps/update/updates.css

@@ -0,0 +1,181 @@
+/**
+ * General
+ */
+.wizard-button[dlgtype="finish"] {
+  font-weight: bold;
+}
+
+link {
+  color: blue;
+  border: 1px solid transparent;
+  margin-top: 1px;
+  margin-bottom: 4px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 5px;
+  text-decoration: underline !important;
+}
+
+link > label {
+  margin: 0px;
+  padding: 1px;
+  text-decoration: underline !important;
+}
+
+link:hover:active {
+  color: red;
+}
+
+link:focus {
+  border: 1px dotted black;
+}
+
+/**
+ * License Page
+ */
+license {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+  -moz-appearance: listbox;
+  padding-bottom: 1px;
+}
+
+.loadingBox {
+  padding: 3px 5px 3px 5px;
+}
+.licenseLoadingThrobber {
+  margin-top: 3px;
+}
+.licenseLoadingThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+.licenseLoadingThrobber[state="error"] {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+/**
+ * Update Found Page
+ */
+#updatesfoundContent {
+  margin: 10px 44px 10px 44px;
+}
+
+wizard[currentpageid="updatesfound"] .wizard-page-box {
+  margin: 0px;
+}
+
+#installButtons {
+  margin: 10px;
+}
+
+#moreDetails {
+  margin: 1px 5px 4px 3px;
+}
+
+#downloadNow {
+  font-weight: bold;
+}
+
+#downloadNow > .button-box {
+  padding-left: 15px;
+  padding-right: 15px;  
+}
+
+#updateForMoreInfo {
+  margin-left: 5px;
+}
+
+#updateName, #updateFinishedName {
+  font-weight: bold;
+  font-size: larger;
+}
+
+#alertImage {
+  list-style-image: url("chrome://global/skin/icons/Warning.png");
+  margin-right: 5px;
+}
+
+#incompatibleWarning {
+  background-color: InfoBackground;
+  color: InfoText;
+  border: 1px outset InfoBackground;
+  padding: 3px;
+  margin: 1px 5px 4px 5px;
+}
+
+/**
+ * Downloading Page
+ */
+#downloadName {
+  margin-top: 3px;
+}
+
+#downloadStatus {
+  margin-top: 6px;
+  height: 3em !important;
+}
+#downloadThrobber {
+  margin: 5px 3px 0px 5px;
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
+}
+#downloadThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+
+#verificationFailedIcon {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  margin: 5px 3px 0px 5px;
+}
+
+/**
+ * Error Page
+ */
+#errorReason {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px !important;
+  -moz-margin-end: 5px;
+  font-weight: bold;
+}
+
+/**
+ * Update History Window
+ */
+update {
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.update-name {
+  font-weight: bold;
+}
+
+.update-label-column {
+  -moz-box-align: end;
+}
+
+.update-details-link {
+  margin: 0px;
+}
+
+.update-type {
+  font-weight: bold;
+  color: #990000;
+}
+
+#historyItems {
+  -moz-appearance: listbox;
+  height: 200px;
+  margin: 1px 5px 4px 5px;
+}
+
+#historyItems > scrollbox {
+  margin-bottom: 1px;
+}
+
+.updatePrefsInfo {
+  font-size: smaller;
+  margin-left: 27px;
+  margin-bottom: 10px;
+}
+

toolkit/themes/winstripe/mozapps/jar.mn

@@ -2,7 +2,7 @@ classic.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/
         skin/classic/mozapps/downloads/downloadIcon.png               (downloads/downloadIcon.png)
         skin/classic/mozapps/downloads/downloadCleanup.png            (downloads/downloadCleanup.png)
-        skin/classic/mozapps/downloads/downloadCleanupDisabled.png            (downloads/downloadCleanupDisabled.png)
+        skin/classic/mozapps/downloads/downloadCleanupDisabled.png    (downloads/downloadCleanupDisabled.png)
         skin/classic/mozapps/downloads/downloads.css                  (downloads/downloads.css)
         skin/classic/mozapps/downloads/downloads.xml                  (downloads/downloads.xml)
         skin/classic/mozapps/downloads/downloadsBG.png                (downloads/downloadsBG.png)
@@ -28,5 +28,6 @@ classic.jar:
         skin/classic/mozapps/update/extensionalert.png                (update/extensionalert.png)
         skin/classic/mozapps/update/update.png                        (update/update.png)
         skin/classic/mozapps/update/warning.gif                       (update/warning.gif)
+        skin/classic/mozapps/update/updates.css                       (update/updates.css)
         skin/classic/mozapps/xpinstall/xpinstallConfirm.css           (xpinstall/xpinstallConfirm.css)
         skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png       (xpinstall/xpinstallItemGeneric.png)

toolkit/themes/winstripe/mozapps/update/updates.css

@@ -0,0 +1,181 @@
+/**
+ * General
+ */
+.wizard-button[dlgtype="finish"] {
+  font-weight: bold;
+}
+
+link {
+  color: blue;
+  border: 1px solid transparent;
+  margin-top: 1px;
+  margin-bottom: 4px;
+  -moz-margin-start: 5px;
+  -moz-margin-end: 5px;
+  text-decoration: underline !important;
+}
+
+link > label {
+  margin: 0px;
+  padding: 1px;
+  text-decoration: underline !important;
+}
+
+link:hover:active {
+  color: red;
+}
+
+link:focus {
+  border: 1px dotted black;
+}
+
+/**
+ * License Page
+ */
+license {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+  -moz-appearance: listbox;
+  padding-bottom: 1px;
+}
+
+.loadingBox {
+  padding: 3px 5px 3px 5px;
+}
+.licenseLoadingThrobber {
+  margin-top: 3px;
+}
+.licenseLoadingThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+.licenseLoadingThrobber[state="error"] {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+/**
+ * Update Found Page
+ */
+#updatesfoundContent {
+  margin: 10px 44px 10px 44px;
+}
+
+wizard[currentpageid="updatesfound"] .wizard-page-box {
+  margin: 0px;
+}
+
+#installButtons {
+  margin: 10px;
+}
+
+#moreDetails {
+  margin: 1px 5px 4px 3px;
+}
+
+#downloadNow {
+  font-weight: bold;
+}
+
+#downloadNow > .button-box {
+  padding-left: 15px;
+  padding-right: 15px;  
+}
+
+#updateForMoreInfo {
+  margin-left: 5px;
+}
+
+#updateName, #updateFinishedName {
+  font-weight: bold;
+  font-size: larger;
+}
+
+#alertImage {
+  list-style-image: url("chrome://global/skin/icons/Warning.png");
+  margin-right: 5px;
+}
+
+#incompatibleWarning {
+  background-color: InfoBackground;
+  color: InfoText;
+  border: 1px outset InfoBackground;
+  padding: 3px;
+  margin: 1px 5px 4px 5px;
+}
+
+/**
+ * Downloading Page
+ */
+#downloadName {
+  margin-top: 3px;
+}
+
+#downloadStatus {
+  margin-top: 6px;
+  height: 3em !important;
+}
+#downloadThrobber {
+  margin: 5px 3px 0px 5px;
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.png");
+}
+#downloadThrobber[state="loading"] {
+  list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif");
+}
+
+#verificationFailedIcon {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  margin: 5px 3px 0px 5px;
+}
+
+/**
+ * Error Page
+ */
+#errorReason {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px !important;
+  -moz-margin-end: 5px;
+  font-weight: bold;
+}
+
+/**
+ * Update History Window
+ */
+update {
+  border-bottom: 1px dotted #C0C0C0;
+}
+
+.update-name {
+  font-weight: bold;
+}
+
+.update-label-column {
+  -moz-box-align: end;
+}
+
+.update-details-link {
+  margin: 0px;
+}
+
+.update-type {
+  font-weight: bold;
+  color: #990000;
+}
+
+#historyItems {
+  -moz-appearance: listbox;
+  height: 200px;
+  margin: 1px 5px 4px 5px;
+}
+
+#historyItems > scrollbox {
+  margin-bottom: 1px;
+}
+
+.updatePrefsInfo {
+  font-size: smaller;
+  margin-left: 27px;
+  margin-bottom: 10px;
+}
+