From a064a54072180bda29a2d7b0ce33cd1e57612218 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 21 Mar 2010 22:33:03 +0100 Subject: [PATCH] update both themes for toolkit winstripe trunk changes up to 2010-02-21 --- EarlyBlue/browser/browser.xml | 2 +- EarlyBlue/global/about.css | 5 ++ EarlyBlue/global/appPicker.css | 7 +- EarlyBlue/global/button.css | 1 + EarlyBlue/global/global.css | 6 ++ EarlyBlue/global/menulist.css | 1 + EarlyBlue/global/toolbarbutton.css | 3 +- EarlyBlue/mozapps/plugins/missingPlugin.css | 69 -------------------- EarlyBlue/mozapps/plugins/pluginCrashed.png | Bin 0 -> 231 bytes EarlyBlue/mozapps/plugins/pluginHelp-16.png | Bin 0 -> 222 bytes EarlyBlue/mozapps/plugins/pluginProblem.css | 68 +++++++++++++++++++ LCARStrek/browser/browser.xml | 2 +- LCARStrek/global/about.css | 5 ++ LCARStrek/global/appPicker.css | 7 +- LCARStrek/global/button.css | 1 + LCARStrek/global/global.css | 7 ++ LCARStrek/global/menulist.css | 1 + LCARStrek/global/toolbarbutton.css | 3 +- LCARStrek/mozapps/plugins/missingPlugin.css | 68 ------------------- LCARStrek/mozapps/plugins/pluginCrashed.png | Bin 0 -> 231 bytes LCARStrek/mozapps/plugins/pluginHelp-16.png | Bin 0 -> 235 bytes LCARStrek/mozapps/plugins/pluginProblem.css | 68 +++++++++++++++++++ 22 files changed, 173 insertions(+), 151 deletions(-) delete mode 100644 EarlyBlue/mozapps/plugins/missingPlugin.css create mode 100644 EarlyBlue/mozapps/plugins/pluginCrashed.png create mode 100644 EarlyBlue/mozapps/plugins/pluginHelp-16.png create mode 100644 EarlyBlue/mozapps/plugins/pluginProblem.css delete mode 100644 LCARStrek/mozapps/plugins/missingPlugin.css create mode 100644 LCARStrek/mozapps/plugins/pluginCrashed.png create mode 100644 LCARStrek/mozapps/plugins/pluginHelp-16.png create mode 100644 LCARStrek/mozapps/plugins/pluginProblem.css diff --git a/EarlyBlue/browser/browser.xml b/EarlyBlue/browser/browser.xml index be92c111..116fb1be 100644 --- a/EarlyBlue/browser/browser.xml +++ b/EarlyBlue/browser/browser.xml @@ -16,7 +16,7 @@ + align,dir,pack,orient"/> diff --git a/EarlyBlue/global/about.css b/EarlyBlue/global/about.css index c626cdcc..05a17f32 100644 --- a/EarlyBlue/global/about.css +++ b/EarlyBlue/global/about.css @@ -54,3 +54,8 @@ ul > li { th, td { padding: 0 5px; } + +.columns { + -moz-column-width: 20em; + -moz-column-gap: 3em; +} diff --git a/EarlyBlue/global/appPicker.css b/EarlyBlue/global/appPicker.css index 561333ee..ca8352da 100644 --- a/EarlyBlue/global/appPicker.css +++ b/EarlyBlue/global/appPicker.css @@ -9,12 +9,11 @@ #content-icon, .listcell-icon { - height: 32px; + margin: 5px; width: 32px; + height: 32px; } -#content-icon, -.listcell-icon, .listcell-label { - margin: 5px; + padding: 5px; } diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css index 5a2642b8..6072ec3f 100644 --- a/EarlyBlue/global/button.css +++ b/EarlyBlue/global/button.css @@ -49,6 +49,7 @@ button { border: 1px outset #CCD0DD; background-color: #CCD0DD; color: #000000; + text-shadow: none; } .button-box { diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 6b8cea4f..990825b6 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -141,6 +141,12 @@ statusbarpanel { padding: 0px 1px; } +statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme { + -moz-appearance: none; + border-top-style: none; + border-bottom-style: none; + -moz-border-start-style: none; +} .statusbar-resizerpanel { -moz-box-align: end; diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css index 6f3d49f4..6ab46893 100644 --- a/EarlyBlue/global/menulist.css +++ b/EarlyBlue/global/menulist.css @@ -49,6 +49,7 @@ menulist { border: 1px inset #CCD0DD; background-color: #CCCCCC; color: #000000; + text-shadow: none; } .menulist-label-box { diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css index 4cd99274..52926c70 100644 --- a/EarlyBlue/global/toolbarbutton.css +++ b/EarlyBlue/global/toolbarbutton.css @@ -81,8 +81,7 @@ toolbarbutton.toolbarbutton-menubutton-button[open="true"] { } */ -toolbarbutton:hover, -toolbarbutton[buttonover="true"] { +toolbarbutton:hover { border: 1px outset #CCD0DD; } diff --git a/EarlyBlue/mozapps/plugins/missingPlugin.css b/EarlyBlue/mozapps/plugins/missingPlugin.css deleted file mode 100644 index 44c63d23..00000000 --- a/EarlyBlue/mozapps/plugins/missingPlugin.css +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file's style only applies to broken objects, not the rest - * of the page. - */ - -@namespace html url(http://www.w3.org/1999/xhtml); - -html|object:not([width]), html|object[width=""], -html|embed:not([width]), html|embed[width=""], -html|applet:not([width]), html|applet[width=""] { - width: 240px; -} - -html|object:not([height]), html|object[height=""], -html|embed:not([height]), html|embed[height=""], -html|applet:not([height]), html|applet[height=""] { - height: 200px; -} - -html|object > *|*, -html|embed > *|*, -html|applet > *|* { - width: inherit; - height: inherit; -} - -html|a, html|div { - text-align: -moz-center; - display: inline-block; - /* overflow:hidden makes baseline vertical-alignment act like plugins */ - overflow: hidden; - vertical-align: inherit; - border: 1px outset; - padding: 5px; - font-size: 12px; - font-family: sans-serif; - background: #FFFFFF; - -moz-user-select: none; - text-decoration: none; - color: #000000; -} - -vbox { - width: inherit; - height: inherit; - -moz-box-align: center; - -moz-box-pack: center; -} - -#missingPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); -} - -#disabledPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png"); -} - -#blockedPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png"); -} - -#missingPluginPlaceholder, -#disabledPluginPlaceholder, -#blockedPluginPlaceholder { - display: block; - border: 0px; - width: 32px; - height: 32px; -} diff --git a/EarlyBlue/mozapps/plugins/pluginCrashed.png b/EarlyBlue/mozapps/plugins/pluginCrashed.png new file mode 100644 index 0000000000000000000000000000000000000000..e3129a503c348018f46d6c04ff208a91fb80998c GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-ijKx9jP7LeL$-D$|*aCb)T(@7? z+|bYEak7aXC3bLGI6g#sBj)y8hb>)Ew~tyYYWA|B|{B|0l2q z$vX(JvxYKVb!fTxUw%XLN;WqG))LVPzmES~Am?)OKSSXE*Z&0#T74K8+*#WlvbVUe Q0UFHU>FVdQ&MBb@0Mxxl)c^nh literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/plugins/pluginHelp-16.png b/EarlyBlue/mozapps/plugins/pluginHelp-16.png new file mode 100644 index 0000000000000000000000000000000000000000..6d35a558e0028deda87f7acc81c283c131e157e4 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-t`dA4X=!Kv|NozsHq&c* zWF}CYu_VYZn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI$&@ zIC%I}lp3?0fkNJ%E{-7_*F{e)WNa|tVK~^o@>s(Qlb#EfM!qb{B92NQBv%FtoS9jF zgT3S4g**PgcK6K7%y{NfEBbJ)zwZZGxcb|27K22WQ% Jmvv4FO#rezL;nB( literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css new file mode 100644 index 00000000..a8ee73c9 --- /dev/null +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -0,0 +1,68 @@ +@namespace html url(http://www.w3.org/1999/xhtml); + +/* These styles affect only the bound element, not other page content. */ + +.mainBox { + text-align: center; + background-color: #CCD0DD; + color: #000000; + -moz-border-radius: 12px; + /* recessed effect with 'disabled' shadow */ + -moz-box-shadow: inset 0 1px 5px #808080; + padding: 5px; + -moz-user-select: none; +} + +html|a { + color: #000000; +} + +.icon { + min-width: 48px; + min-height: 48px; + background-position: center; + background-repeat: no-repeat; +} +:-moz-type-unsupported .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} +:-moz-handler-disabled .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png"); +} +:-moz-handler-blocked .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png"); +} +:-moz-handler-crashed .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginCrashed.png"); +} + +.throbber { + padding-left: 16px; /* width of the background image */ + background: url("chrome://global/skin/icons/loading.gif") no-repeat; + margin-left: 5px; +} + +.msg { + font-size: 12px; + cursor: default; +} + +.msgBottomLinks { + padding-left: 2px; + padding-right: 2px; +} + +.msgBottomLinks div { + text-align: right; + margin-right: 4px; + margin-bottom: -19px; + min-height: 19px; /* height of biggest line (with throbber) */ +} + +.helpIcon { + float: left; + display: inline-block; + min-width: 16px; + min-height: 16px; + background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; +} diff --git a/LCARStrek/browser/browser.xml b/LCARStrek/browser/browser.xml index 111c17f5..516bfb1e 100644 --- a/LCARStrek/browser/browser.xml +++ b/LCARStrek/browser/browser.xml @@ -16,7 +16,7 @@ + align,dir,pack,orient"/> diff --git a/LCARStrek/global/about.css b/LCARStrek/global/about.css index 18f2a6b6..f62ad406 100644 --- a/LCARStrek/global/about.css +++ b/LCARStrek/global/about.css @@ -54,3 +54,8 @@ ul > li { th, td { padding: 0 5px; } + +.columns { + -moz-column-width: 20em; + -moz-column-gap: 3em; +} diff --git a/LCARStrek/global/appPicker.css b/LCARStrek/global/appPicker.css index 561333ee..ca8352da 100644 --- a/LCARStrek/global/appPicker.css +++ b/LCARStrek/global/appPicker.css @@ -9,12 +9,11 @@ #content-icon, .listcell-icon { - height: 32px; + margin: 5px; width: 32px; + height: 32px; } -#content-icon, -.listcell-icon, .listcell-label { - margin: 5px; + padding: 5px; } diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css index 2d4f1e50..e3311b8f 100644 --- a/LCARStrek/global/button.css +++ b/LCARStrek/global/button.css @@ -50,6 +50,7 @@ button { border: none; background-color: #000000; color: #FFCF00; + text-shadow: none; } .button-box { diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index 0ee50ab3..f1ecfc07 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -182,6 +182,13 @@ statusbarpanel { padding: 0px 2px; } +statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme { + -moz-appearance: none; + border-top-style: none; + border-bottom-style: none; + -moz-border-start-style: none; +} + .statusbar-resizerpanel { -moz-box-align: end; -moz-box-pack: end; diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css index 1ee9b22a..519b2abb 100644 --- a/LCARStrek/global/menulist.css +++ b/LCARStrek/global/menulist.css @@ -50,6 +50,7 @@ menulist { border: 1px solid #9C9CFF; background-color: #000000; color: #E7ADE7; + text-shadow: none; } menulist[menuactive="true"], diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index 087dcd70..188cb26b 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -79,8 +79,7 @@ toolbarbutton:focus { -moz-outline-offset: -1px; } -toolbarbutton:hover, -toolbarbutton[buttonover="true"] { +toolbarbutton:hover { background-color: #FFCF00; color: #000000; } diff --git a/LCARStrek/mozapps/plugins/missingPlugin.css b/LCARStrek/mozapps/plugins/missingPlugin.css deleted file mode 100644 index 1db7f5f1..00000000 --- a/LCARStrek/mozapps/plugins/missingPlugin.css +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file's style only applies to broken objects, not the rest - * of the page. - */ - -@namespace html url(http://www.w3.org/1999/xhtml); - -html|object:not([width]), html|object[width=""], -html|embed:not([width]), html|embed[width=""], -html|applet:not([width]), html|applet[width=""] { - width: 240px; -} - -html|object:not([height]), html|object[height=""], -html|embed:not([height]), html|embed[height=""], -html|applet:not([height]), html|applet[height=""] { - height: 200px; -} - -html|object > *|*, -html|embed > *|*, -html|applet > *|* { - width: inherit; - height: inherit; -} - -html|a, html|div { - display: inline-block; - /* overflow:hidden makes baseline vertical-alignment act like plugins */ - overflow: hidden; - vertical-align: inherit; - border: 1px outset; - padding: 5px; - font-size: 12px; - font-family: sans-serif; - background: #000000; - -moz-user-select: none; - text-decoration: none; - color: #FFCF00; -} - -vbox { - width: inherit; - height: inherit; - -moz-box-align: center; - -moz-box-pack: center; -} - -#missingPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); -} - -#disabledPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png"); -} - -#blockedPluginPlaceholder { - list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png"); -} - -#missingPluginPlaceholder, -#disabledPluginPlaceholder, -#blockedPluginPlaceholder { - display: block; - border: 0px; - width: 32px; - height: 32px; -} diff --git a/LCARStrek/mozapps/plugins/pluginCrashed.png b/LCARStrek/mozapps/plugins/pluginCrashed.png new file mode 100644 index 0000000000000000000000000000000000000000..e76eecac267c558ff8c37b3a0625a969869b7d1e GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-ijKx9jP7LeL$-D$|*aCb)T(`ft z+z_xqj_Ip0NV+7*FPOpM*^M+1C&}C0g`tC0)&t1lEbxddW?}ocU-AEZjjsRp0yPKx|8D%B%)g}W#QzEG zLGlg)?5v?oR~=d|{+Hj-ypqk$fVD()!ms217Rb4r{Lc{h|Mh=CgH|5~26xtWhwLrx RYk&qbc)I$ztaD0e0sx@|M@j$y literal 0 HcmV?d00001 diff --git a/LCARStrek/mozapps/plugins/pluginHelp-16.png b/LCARStrek/mozapps/plugins/pluginHelp-16.png new file mode 100644 index 0000000000000000000000000000000000000000..3df227e9520d2054a612fc52ca2480f5365f03a6 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9jKx9jP7LeL$-D$|cmjMvTp3b} z=gj&4e8P8m5MITO*Mst%qri- V?WO+Q?gJXj;OXk;vd$@?2>?4*NX-BM literal 0 HcmV?d00001 diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css new file mode 100644 index 00000000..a41b6647 --- /dev/null +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -0,0 +1,68 @@ +@namespace html url(http://www.w3.org/1999/xhtml); + +/* These styles affect only the bound element, not other page content. */ + +.mainBox { + text-align: center; + background-color: #000000; + color: #FFCF00; + -moz-border-radius: 12px; + /* recessed effect with 'disabled' shadow */ + -moz-box-shadow: inset 0 1px 5px #8050B0; + padding: 5px; + -moz-user-select: none; +} + +html|a { + color: #FFCF00; +} + +.icon { + min-width: 48px; + min-height: 48px; + background-position: center; + background-repeat: no-repeat; +} +:-moz-type-unsupported .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); +} +:-moz-handler-disabled .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png"); +} +:-moz-handler-blocked .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png"); +} +:-moz-handler-crashed .icon { + background-image: url("chrome://mozapps/skin/plugins/pluginCrashed.png"); +} + +.throbber { + padding-left: 16px; /* width of the background image */ + background: url("chrome://global/skin/icons/loading.gif") no-repeat; + margin-left: 5px; +} + +.msg { + font-size: 12px; + cursor: default; +} + +.msgBottomLinks { + padding-left: 2px; + padding-right: 2px; +} + +.msgBottomLinks div { + text-align: right; + margin-right: 4px; + margin-bottom: -19px; + min-height: 19px; /* height of biggest line (with throbber) */ +} + +.helpIcon { + float: left; + display: inline-block; + min-width: 16px; + min-height: 16px; + background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat; +} -- 2.43.0