From 1e29db46dc44bb298673e0574cef312051e15a94 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 28 Jan 2012 00:56:01 +0100 Subject: [PATCH] update both themes for changes in toolkit winstripe for Mozilla 10 platform --- EarlyBlue/global/inContentUI.css | 14 +++++++-- EarlyBlue/global/media/videocontrols.css | 26 +++++++++++++++++ EarlyBlue/mozapps/extensions/about.css | 4 +++ .../extensions/category-dictionaries.png | Bin 0 -> 233 bytes .../extensions/dictionaryGeneric-16.png | Bin 0 -> 206 bytes .../mozapps/extensions/dictionaryGeneric.png | Bin 0 -> 233 bytes EarlyBlue/mozapps/extensions/eula.css | 27 ++++++++++++++++++ EarlyBlue/mozapps/extensions/extensions.css | 7 +++++ EarlyBlue/mozapps/extensions/newaddon.css | 4 +++ EarlyBlue/mozapps/extensions/selectAddons.css | 4 +++ EarlyBlue/mozapps/plugins/pluginProblem.css | 3 ++ .../mozapps/xpinstall/xpinstallConfirm.css | 4 +++ LCARStrek/browser/searchbar.css | 2 +- LCARStrek/global/findBar.css | 4 +-- LCARStrek/global/inContentUI.css | 14 +++++++-- LCARStrek/global/media/videocontrols.css | 26 +++++++++++++++++ LCARStrek/mozapps/extensions/about.css | 4 +++ LCARStrek/mozapps/extensions/eula.css | 27 ++++++++++++++++++ LCARStrek/mozapps/extensions/extensions.css | 7 +++++ LCARStrek/mozapps/extensions/newaddon.css | 4 +++ LCARStrek/mozapps/extensions/selectAddons.css | 4 +++ LCARStrek/mozapps/plugins/pluginProblem.css | 3 ++ .../mozapps/xpinstall/xpinstallConfirm.css | 4 +++ 23 files changed, 185 insertions(+), 7 deletions(-) create mode 100644 EarlyBlue/mozapps/extensions/category-dictionaries.png create mode 100644 EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png create mode 100644 EarlyBlue/mozapps/extensions/dictionaryGeneric.png diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css index 7b75d425..fbe5ce19 100644 --- a/EarlyBlue/global/inContentUI.css +++ b/EarlyBlue/global/inContentUI.css @@ -20,6 +20,7 @@ * * Contributor(s): * Blair McBride + * Philipp von Weitershausen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -35,17 +36,26 @@ * * ***** END LICENSE BLOCK ***** */ +/* + * The default namespace for this file is XUL. Be sure to prefix rules that + * are applicable to both XUL and HTML with '*|'. + */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); /* Page background */ -:root { +*|*:root { background-color: #CCD0DD; color: #000000; margin: 20px; } +html|html { + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; +} + /* Content */ -.main-content { +*|*.main-content { /* Needed to allow the radius to clip the inner content, see bug 595656 */ /* Disabled because of bug 623615 overflow: hidden; diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index 992f406d..00faa807 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -1,4 +1,5 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); .controlBar { height: 28px; @@ -188,6 +189,31 @@ background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; } +/* Statistics formatting */ +html|*.statsDiv { + position: relative; +} +html|td { + height: 1em; + max-height: 1em; + padding: 0 2px; +} +html|table { + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 11px; + color: white; + text-shadow: + -1px -1px 0 #000, + 1px -1px 0 #000, + -1px 1px 0 #000, + 1px 1px 0 #000; + min-width: 100%; + background: rgba(68,68,68,.7); + table-layout: fixed; + border-collapse: collapse; + position: absolute; +} + /* CSS Transitions */ .controlBar:not([immediate]) { -moz-transition-property: opacity; diff --git a/EarlyBlue/mozapps/extensions/about.css b/EarlyBlue/mozapps/extensions/about.css index 9a19ccac..88dfc32b 100644 --- a/EarlyBlue/mozapps/extensions/about.css +++ b/EarlyBlue/mozapps/extensions/about.css @@ -33,6 +33,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +#genericAbout[addontype="dictionary"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + #extensionName { font-size: large; font-weight: bold; diff --git a/EarlyBlue/mozapps/extensions/category-dictionaries.png b/EarlyBlue/mozapps/extensions/category-dictionaries.png new file mode 100644 index 0000000000000000000000000000000000000000..bd42dbcd71ee1c60a0ab2177aa57aeb7faea2454 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%Cx&(BWL^R}oB=)|t_%$6 zX=!K9T)2DV=7P5%6(vD_!3+-1Zlr-YN#5=*3>~bp9w6lf9+AZi4BWyX%*Zfnjs#GU zy~NYkmHiH*w3w3O0|hpaCLd21#}J9j$q5HodKNkeFr;i)$JE5>&?eEN$Tf+J(Qr|N zlD9_EnI^+S3O$k9ixqk{ER7U6c4cM2QSZYGdZq>%yp0sO)pxAnC$}sEL+*b619pei R+<@jXc)I$ztaD0e0svkHLp%Tg literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png b/EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png new file mode 100644 index 0000000000000000000000000000000000000000..ba7715c008e82af1fe0bee228d25fbb05979f421 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9jKx9jP7LeL$-D$|I0Jk_Tp1YB z)6&kIxp4Q!%>{2kDoTRtHDW!S!iZ( pqf3@VhbXJi=~)d6`Id;YFtmIUJ;bMYxEZLK!PC{xWt~$(69E4tHaY+R literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/extensions/dictionaryGeneric.png b/EarlyBlue/mozapps/extensions/dictionaryGeneric.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6e5267e0abc8a6c81222d756044520239c5da0 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%Cx&(BWL^R}oB=)|t_%$6 zX=!K9T)2DV=7P5%6(vD_!3+-1Zlr-YN#5=*3>~bp9w6lf9+AZi4BWyX%*Zfnjs#GU zy~NYkmHiH*w3w3N-|1pZKp`Jb7sn8Z%gG4`Sb7#Z2r#5Ch(8qsTRhi_vgV zgOayK(wQd1Lkc~S+KUx>HY|-4ICf=az)|nR3wovo8oZ4Zxz%^9;U~8&14Hh9{{wc1 S)!cyQGI+ZBxvX .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); } +#category-dictionary > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); +} #category-availableUpdates > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); } @@ -461,6 +464,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +.addon-view[type="dictionary"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + .name-container { font-size: 150%; font-weight: bold; diff --git a/EarlyBlue/mozapps/extensions/newaddon.css b/EarlyBlue/mozapps/extensions/newaddon.css index 97f6ed9c..4493d14f 100644 --- a/EarlyBlue/mozapps/extensions/newaddon.css +++ b/EarlyBlue/mozapps/extensions/newaddon.css @@ -83,6 +83,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +.addon-info[type="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/dictionaryGeneric.png"); +} + #name { font-size: 130%; } diff --git a/EarlyBlue/mozapps/extensions/selectAddons.css b/EarlyBlue/mozapps/extensions/selectAddons.css index 9ab50f7e..97840879 100644 --- a/EarlyBlue/mozapps/extensions/selectAddons.css +++ b/EarlyBlue/mozapps/extensions/selectAddons.css @@ -167,6 +167,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); } +.addon-icon[type="dictionary"] { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png"); +} + .action-list { margin-top: 10px; -moz-margin-start: 5em; diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css index 1ecac655..e5efea31 100644 --- a/EarlyBlue/mozapps/plugins/pluginProblem.css +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -29,6 +29,9 @@ html|a { :-moz-type-unsupported .icon[status="ready"] { background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } +:-moz-handler-clicktoplay .icon { + background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); +} :-moz-handler-disabled .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); } diff --git a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css index 1c2b4290..0c83ab4c 100644 --- a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css +++ b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css @@ -81,3 +81,7 @@ installitem[type="locale"] .xpinstallItemIcon { installitem[type="plugin"] .xpinstallItemIcon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } + +installitem[type="dictionary"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index 63efbbcd..831f3472 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -30,7 +30,7 @@ border: none; } -.searchbar-engine-button["open=true"] { +.searchbar-engine-button[open="true"] { background-color: #FF9F00; } diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css index 74603862..b31fbd81 100644 --- a/LCARStrek/global/findBar.css +++ b/LCARStrek/global/findBar.css @@ -9,8 +9,8 @@ } findbar { - border-top: 1px solid #000000; - border-bottom: 1px solid transparent; + border-top: 3px solid #000000; + border-bottom: none; min-width: 1px; } diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css index aa5d8893..3af3fd73 100644 --- a/LCARStrek/global/inContentUI.css +++ b/LCARStrek/global/inContentUI.css @@ -20,6 +20,7 @@ * * Contributor(s): * Blair McBride + * Philipp von Weitershausen * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -35,17 +36,26 @@ * * ***** END LICENSE BLOCK ***** */ +/* + * The default namespace for this file is XUL. Be sure to prefix rules that + * are applicable to both XUL and HTML with '*|'. + */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); /* Page background */ -:root { +*|*:root { background-color: #000000; color: #FF9F00; margin: 20px; } +html|html { + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; +} + /* Content */ -.main-content { +*|*.main-content { /* Needed to allow the radius to clip the inner content, see bug 595656 */ /* Disabled because of bug 623615 overflow: hidden; diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 27d9cd3b..54e3a934 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -1,4 +1,5 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); .controlBar { height: 28px; @@ -215,6 +216,31 @@ background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; } +/* Statistics formatting */ +html|*.statsDiv { + position: relative; +} +html|td { + height: 1em; + max-height: 1em; + padding: 0 2px; +} +html|table { + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 11px; + color: white; + text-shadow: + -1px -1px 0 #000, + 1px -1px 0 #000, + -1px 1px 0 #000, + 1px 1px 0 #000; + min-width: 100%; + background: rgba(68,68,111,.7); + table-layout: fixed; + border-collapse: collapse; + position: absolute; +} + /* CSS Transitions */ .controlBar:not([immediate]) { -moz-transition-property: opacity; diff --git a/LCARStrek/mozapps/extensions/about.css b/LCARStrek/mozapps/extensions/about.css index 803d8acc..0d454bea 100644 --- a/LCARStrek/mozapps/extensions/about.css +++ b/LCARStrek/mozapps/extensions/about.css @@ -33,6 +33,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +#genericAbout[addontype="dictionary"] #extensionIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + #extensionName { font-size: large; font-weight: bold; diff --git a/LCARStrek/mozapps/extensions/eula.css b/LCARStrek/mozapps/extensions/eula.css index 2250f699..c9965460 100644 --- a/LCARStrek/mozapps/extensions/eula.css +++ b/LCARStrek/mozapps/extensions/eula.css @@ -1,3 +1,30 @@ +#icon { + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + max-width: 48px; + max-height: 48px; + -moz-margin-end: 6px; +} + +#eula-dialog[addontype="theme"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); +} + +#eula-dialog[addontype="locale"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); +} + +#eula-dialog[addontype="plugin"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} + +#eula-dialog[addontype="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + +#heading-container { + -moz-box-align: center; +} + #heading { font-size: 120%; } diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 03efde1b..24f925b4 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -298,6 +298,9 @@ #category-plugin > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); } +#category-dictionary > .category-icon { + list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); +} #category-availableUpdates > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); } @@ -494,6 +497,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +.addon-view[type="dictionary"] .icon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} + .name-container { font-size: 150%; font-weight: bold; diff --git a/LCARStrek/mozapps/extensions/newaddon.css b/LCARStrek/mozapps/extensions/newaddon.css index 08066ebf..d85e6f2b 100644 --- a/LCARStrek/mozapps/extensions/newaddon.css +++ b/LCARStrek/mozapps/extensions/newaddon.css @@ -83,6 +83,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } +.addon-info[type="dictionary"] #icon { + list-style-image: url("chrome://mozapps/skin/plugins/dictionaryGeneric.png"); +} + #name { font-size: 130%; } diff --git a/LCARStrek/mozapps/extensions/selectAddons.css b/LCARStrek/mozapps/extensions/selectAddons.css index 7beb95c8..59922e0d 100644 --- a/LCARStrek/mozapps/extensions/selectAddons.css +++ b/LCARStrek/mozapps/extensions/selectAddons.css @@ -168,6 +168,10 @@ list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); } +.addon-icon[type="dictionary"] { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png"); +} + .action-list { margin-top: 10px; -moz-margin-start: 5em; diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 83f75cea..98e325b2 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -29,6 +29,9 @@ html|a { :-moz-type-unsupported .icon[status="ready"] { background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } +:-moz-handler-clicktoplay .icon { + background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); +} :-moz-handler-disabled .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); } diff --git a/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css b/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css index 3103cced..5f4b579d 100644 --- a/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css +++ b/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css @@ -82,3 +82,7 @@ installitem[type="locale"] .xpinstallItemIcon { installitem[type="plugin"] .xpinstallItemIcon { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } + +installitem[type="dictionary"] .xpinstallItemIcon { + list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); +} -- 2.35.3