From badc645fd7f4b66798391436af97b328371414fc Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Mon, 25 Jul 2005 22:17:53 +0000 Subject: [PATCH] 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 | 2 +- toolkit/mozapps/update/content/history.xul | 1 + .../mozapps/update/content/incompatible.xul | 1 + toolkit/mozapps/update/content/updates.css | 156 --------------- toolkit/mozapps/update/content/updates.xul | 1 + .../mozapps/update/src/nsUpdateService.js.in | 2 +- toolkit/themes/pinstripe/mozapps/jar.mn | 1 + .../pinstripe/mozapps/update/updates.css | 181 ++++++++++++++++++ toolkit/themes/qute/mozapps/jar.mn | 1 + .../themes/qute/mozapps/update/updates.css | 181 ++++++++++++++++++ toolkit/themes/winstripe/mozapps/jar.mn | 3 +- .../winstripe/mozapps/update/updates.css | 181 ++++++++++++++++++ 12 files changed, 552 insertions(+), 159 deletions(-) create mode 100755 toolkit/themes/pinstripe/mozapps/update/updates.css create mode 100755 toolkit/themes/qute/mozapps/update/updates.css create mode 100755 toolkit/themes/winstripe/mozapps/update/updates.css diff --git a/toolkit/mozapps/preferences/update.xul b/toolkit/mozapps/preferences/update.xul index bb60d063c1e..494cf5ddd50 100644 --- a/toolkit/mozapps/preferences/update.xul +++ b/toolkit/mozapps/preferences/update.xul @@ -44,7 +44,7 @@ ]> - + + + 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; } diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul index 0849c1d3609..1bdc795aed5 100755 --- a/toolkit/mozapps/update/content/updates.xul +++ b/toolkit/mozapps/update/content/updates.xul @@ -39,6 +39,7 @@ + diff --git a/toolkit/mozapps/update/src/nsUpdateService.js.in b/toolkit/mozapps/update/src/nsUpdateService.js.in index 64b5eb7cb11..283041ee066 100644 --- a/toolkit/mozapps/update/src/nsUpdateService.js.in +++ b/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 diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn index 5c315456931..60f390982e7 100755 --- a/toolkit/themes/pinstripe/mozapps/jar.mn +++ b/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) diff --git a/toolkit/themes/pinstripe/mozapps/update/updates.css b/toolkit/themes/pinstripe/mozapps/update/updates.css new file mode 100755 index 00000000000..5fec1983acf --- /dev/null +++ b/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; +} + diff --git a/toolkit/themes/qute/mozapps/jar.mn b/toolkit/themes/qute/mozapps/jar.mn index 6920beaa212..51ecce18dec 100644 --- a/toolkit/themes/qute/mozapps/jar.mn +++ b/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) diff --git a/toolkit/themes/qute/mozapps/update/updates.css b/toolkit/themes/qute/mozapps/update/updates.css new file mode 100755 index 00000000000..5fec1983acf --- /dev/null +++ b/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; +} + diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn index 2161299b2df..9d196f707db 100644 --- a/toolkit/themes/winstripe/mozapps/jar.mn +++ b/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) diff --git a/toolkit/themes/winstripe/mozapps/update/updates.css b/toolkit/themes/winstripe/mozapps/update/updates.css new file mode 100755 index 00000000000..5fec1983acf --- /dev/null +++ b/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; +} +