From 25fe52645ef988436b57074ab129945504adf926 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Thu, 8 Aug 2013 02:54:19 +0200 Subject: [PATCH 1/1] update both themes for toolkit windows theme changes in Mozilla 24 cycle --- EarlyBlue/global/toolbar.css | 14 +-- .../mozapps/plugins/contentPluginActivate.png | Bin 0 -> 168 bytes .../plugins/contentPluginClickToPlay.png | Bin 253 -> 0 bytes .../plugins/contentPluginClickToPlayPlain.png | Bin 393 -> 0 bytes .../mozapps/plugins/contentPluginClose.png | Bin 0 -> 242 bytes .../mozapps/plugins/notifyPluginBlocked.png | Bin 226 -> 0 bytes .../mozapps/plugins/notifyPluginOutdated.png | Bin 263 -> 0 bytes EarlyBlue/mozapps/plugins/pluginProblem.css | 100 ++++++++--------- EarlyBlue/mozapps/update/updates.css | 15 +++ .../notifyPluginBlocked.png | Bin .../notifyPluginOutdated.png | Bin LCARStrek/global/toolbar.css | 14 +-- .../mozapps/plugins/contentPluginActivate.png | Bin 0 -> 168 bytes .../plugins/contentPluginClickToPlay.png | Bin 253 -> 0 bytes .../plugins/contentPluginClickToPlayPlain.png | Bin 393 -> 0 bytes .../mozapps/plugins/contentPluginClose.png | Bin 430 -> 242 bytes LCARStrek/mozapps/plugins/pluginProblem.css | 103 ++++++++---------- LCARStrek/mozapps/update/updates.css | 15 +++ origdiff | 4 +- 19 files changed, 135 insertions(+), 130 deletions(-) create mode 100644 EarlyBlue/mozapps/plugins/contentPluginActivate.png delete mode 100644 EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png delete mode 100644 EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png create mode 100644 EarlyBlue/mozapps/plugins/contentPluginClose.png delete mode 100644 EarlyBlue/mozapps/plugins/notifyPluginBlocked.png delete mode 100644 EarlyBlue/mozapps/plugins/notifyPluginOutdated.png rename LCARStrek/{mozapps/plugins => browser}/notifyPluginBlocked.png (100%) rename LCARStrek/{mozapps/plugins => browser}/notifyPluginOutdated.png (100%) create mode 100644 LCARStrek/mozapps/plugins/contentPluginActivate.png delete mode 100644 LCARStrek/mozapps/plugins/contentPluginClickToPlay.png delete mode 100644 LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png diff --git a/EarlyBlue/global/toolbar.css b/EarlyBlue/global/toolbar.css index 3cba7428..dbea9595 100644 --- a/EarlyBlue/global/toolbar.css +++ b/EarlyBlue/global/toolbar.css @@ -76,13 +76,6 @@ toolbarpaletteitem { background-color: #FFFFFF !important; } -toolbarpaletteitem[place="toolbar"] { - -moz-margin-start: -2px; - -moz-margin-end: -2px; - border-left: 2px solid transparent; - border-right: 2px solid transparent; -} - toolbarpaletteitem[place="toolbar"] > toolbarspacer { width: 11px; } @@ -113,6 +106,13 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer { /* ..... drag and drop feedback ..... */ +toolbarpaletteitem[place="toolbar"] { + -moz-margin-start: -2px; + -moz-margin-end: -2px; + border-left: 2px solid transparent; + border-right: 2px solid transparent; +} + toolbarpaletteitem[dragover="left"] { border-left-color: #000000; } diff --git a/EarlyBlue/mozapps/plugins/contentPluginActivate.png b/EarlyBlue/mozapps/plugins/contentPluginActivate.png new file mode 100644 index 0000000000000000000000000000000000000000..b0cb741f70f3b9299a596802fea3116853c8022d GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-iYymzYu0Xn>p?NMQuIzU?*!ek4On%;b z0ThzZKxGV`u6{1-oD!M< D1DGq- literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png b/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png deleted file mode 100644 index 2702cc4d860618f7b3659bc2e50487fd4c1d494b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-ijKx9jP7LeL$-D$|*aCb)T!C~$ zL&K!Zohl&dk|4ie28U-i(m~$&XiG_MI85sO@N{_l)$*lxh$KdJe=d#Wzp$Py)0Z=Ib diff --git a/EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png b/EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png deleted file mode 100644 index a02a59c35bec4284e9ae5349c9c3c473a9d52852..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^2|#SX#0(@SS4@uqQak}ZA+D*q=|JY03wIkD8onPf z%mZ>5OM?7@862M7NCR<_yxm;OkH}&M25w;xW@MN(M*=9wUgGKN%6^xH zU06x|me%K%~RaUDG|$Wlq!Qk|Z|{^KFGm zA$8IIVe{tvpL|2JD?jku=Y*fl8J-D!iIzt<>`5}niZhOgZJa9bbduM>8C+|Y1R50H z)4FljZJPgg&ebxsLQ0FPghvj6}9 diff --git a/EarlyBlue/mozapps/plugins/contentPluginClose.png b/EarlyBlue/mozapps/plugins/contentPluginClose.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b62627d5d4182be01beebdca66900ec745150a GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et#0(_4@}`~wQak}ZA+D*q=|E;fL&N|7|98$h zY69dimIV0)GdMiEkp|)wP#!YjIg%Q(-LXCzQF5;OI}ECed0Bq=(}vZ di5Ds#vtB6YRSOx zpMhcK%rpNF9QgnL|I;O`q9Ao8L4Lsu4$p3+fjCLt?k)@+tg;?J4rhT!WHAE+w=f7Z zGR&GI0Tg5}@$_|Nzr`#f#HW4AyhjlzWbf(X7{YNqIl+NJja7}+!1<=fO%5G~B~u-p zd=vy(SMWsmaq>7Q9cyYjrXZN=?C6-tarh|fT*k>wnr+$c>$|=C` zpMhcK%rpNR82`ed)NtU=qlsM<-=BDPAFgO>bCYGe8D3oWGWGJ|M z`UZqI@`(c#*?YP;hHzX@PH toolbarspacer { width: 11px; } @@ -179,6 +172,13 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer { /* ..... drag and drop feedback ..... */ +toolbarpaletteitem[place="toolbar"] { + -moz-margin-start: -2px; + -moz-margin-end: -2px; + border-left: 2px solid transparent; + border-right: 2px solid transparent; +} + toolbarpaletteitem[dragover="left"] { border-left-color: #008484; } diff --git a/LCARStrek/mozapps/plugins/contentPluginActivate.png b/LCARStrek/mozapps/plugins/contentPluginActivate.png new file mode 100644 index 0000000000000000000000000000000000000000..a107b6bf2702ee6a295e5a3d2a02f2dfad86feab GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-iYymzYu0XmWV1sFg&vYP*u_VYZ zn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuIzU?*!j759WJse z1BIkLT^vIsE+;1_$o=`R_T$WAJqKb6Mw<&;$VayiczH diff --git a/LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png b/LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png deleted file mode 100644 index 69feb08d84a84b5790ad967ec5aad58cf017a59d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^2|#SX#0(@SS4@uqQak}ZA+D*q=|E;fz=r?l8H^Za zZvt`{OM?7@862M7NCR<_yxm;OkH}&M25w;xW@MN(M*=9wUgGKN%6^ww zo=L>)ydB>wpwKr@7sn8b)4fv+`I-%QTm|n&>|me%K%~RaUDG|$Wlq!Qk|Z|{^KFGm zA$8IIVe{tvpL|2JD?jku=Y*fl8J-D!iIzt<>`5}niZhOgZJa9bbduM>8C+|Y1R50H z)4FljZJPgg&ebxsLQ07svX^8f$< diff --git a/LCARStrek/mozapps/plugins/contentPluginClose.png b/LCARStrek/mozapps/plugins/contentPluginClose.png index 094deac56554f2737126270b2ff2d167192a933e..b42c158d99361de8ad33f954663924d881e6f230 100644 GIT binary patch delta 226 zcmZ3-{E2abL_HHT0|NtB-qce-iYLG)#5Gkn9ms45*zo^6gAv2*O+XG~NswPKgTu2M zX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD+3#|2Fi1(5d|dJgC=~DM z;uykl-M4QqZ-atJi~g;fJJ`Jq*i=_XTXd=JY!fWu{I+4CV$0<=@!j6GUSHt#!zC}Iw?6S2PxM_j-oy))k6Eu22hM&e Sc6=AmE(T9mKbLh*2~7Y(IZOBe delta 416 zcmV;R0bl;|0j>j(7=H)`0001Y0DV~i000JJOGiWi{{a60|De66lK=n!32;bRa{vGf z6951U69E94oEQKA00(qQO+^RY10Mnz23$!%3jhECJ4r-AR7l6oRWWvhFbtLaIxw=~ z8!+c4v=hgG$y)=Xrt}z{8g7!AoPcg*V~RTD(b&SqVQDG`jDLjnKl=X}1QAt9Svuvz z6|PQRfr2sV^~b0AhLxyF$_~a1zFJMR*pK!@Q*_M0YyANMq3H_r)%X%}0ToC*U&yMJ2+7d}~pdITtx3xyBJmkSd3 z%TO`>W3t5bkIABx;NY0AJvyV8B$S804a6sR^ga@5OnM#jK}i2G>2*z{V?GG!UlZx4 zA4LD-D1PS8$Z=8A6?jR`8UcaDg@ABL&N>7>Hx7B?R~hr2`_Vsney0PJA3uix0000< KMNUMnLSTabbhz69 diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 379b04b8..32e67ae5 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -8,18 +8,33 @@ .mainBox { text-align: center; + display: table; + width: 100%; + height: 100%; background-color: #000000; color: #FFCF00; - border-radius: 12px; - /* recessed effect with 'disabled' shadow */ - box-shadow: inset 0 1px 5px #8050B0; - padding: 5px; -moz-user-select: none; position: relative; } .hoverBox { + display: table-cell; + -moz-box-sizing: border-box; padding: 5px; + vertical-align: middle; + width: 100%; + height: 100%; +} +:-moz-handler-vulnerable-updatable .hoverBox:active, +:-moz-handler-vulnerable-no-update .hoverBox:active, +:-moz-handler-clicktoplay .hoverBox:active { + background-color: #404000; +} + +:-moz-handler-vulnerable-updatable .hoverBox, +:-moz-handler-vulnerable-no-update .hoverBox, +:-moz-handler-blocked .hoverBox, +:-moz-handler-crashed .hoverBox { } html|a { @@ -27,14 +42,16 @@ html|a { } .icon { - display: inline-block; width: 48px; height: 48px; background-position: center; background-repeat: no-repeat; border: none; background-color: transparent; + -moz-user-focus: ignore; + margin-bottom: 6px; } + :-moz-type-unsupported .icon, :-moz-type-unsupported-platform .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); @@ -45,24 +62,19 @@ html|a { :-moz-handler-clicktoplay .icon, :-moz-handler-vulnerable-updatable .icon, :-moz-handler-vulnerable-no-update .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginClickToPlay.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); + -moz-user-focus: normal; } - -:-moz-handler-clicktoplay .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginClickToPlayPlain.png"); - background-position: 0 0; +:-moz-handler-blocked .icon { + background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); } -:-moz-handler-clicktoplay .hoverBox:hover .icon, -:-moz-handler-clicktoplay .hoverBox:hover:active .icon { - background-position: -48px 0; +:-moz-handler-clicktoplay .icon { + background-image: url("chrome://mozapps/skin/plugins/contentPluginActivate.png"); + -moz-user-focus: normal; } - :-moz-handler-disabled .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); } -:-moz-handler-blocked .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginBlocked.png"); -} :-moz-handler-crashed .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginCrashed.png"); } @@ -73,19 +85,6 @@ html|a { margin-left: 5px; } -.msg { - cursor: default; - width: 100%; -} - -:-moz-handler-clicktoplay .mainBox, -:-moz-handler-clicktoplay .icon, -:-moz-handler-clicktoplay .msgClickToPlay, -:-moz-handler-vulnerable-updatable .msgClickToPlay, -:-moz-handler-vulnerable-no-update .msgClickToPlay { - cursor: pointer; -} - @media not all and (-moz-touch-enabled) { :-moz-handler-clicktoplay .msgTapToPlay { display: none; @@ -161,11 +160,11 @@ html|a { right: 4px; border: none; background-color: transparent; - background-image: url("chrome://global/skin/icons/close.png"); + background-image: url("mozapps/skin/plugins/contentPluginClose.png"); background-repeat: no-repeat; } -.closeIcon:-moz-locale-dir(rtl) { +.mainBox[chromedir="rtl"] .closeIcon(rtl) { right: auto; left: 4px; } @@ -175,34 +174,22 @@ html|a { background-position: -16px 0; } -:-moz-handler-clicktoplay .mainBox { - background-image: none; - background-color: rgba(0, 0, 0, .2); - border: 2px dashed rgba(255, 207, 0, 0.7); - border-radius: 8px; - color: #8050B0; - text-shadow: none; - box-shadow: none; - transition: background-color 150ms ease; -} - -:-moz-handler-clicktoplay .mainBox:hover, -:-moz-handler-clicktoplay .mainBox:hover:active { - background-color: rgba(0, 0, 0, .8); +.action-link { + display: inline-block; + border-radius: 10px; + background-color: #C09070; + color: #000000; + padding: 2px 8px; + margin-top: 7px; + text-decoration: none; } - -:-moz-handler-clicktoplay .mainBox, -:-moz-handler-clicktoplay html|a { - color: #8050B0; +.action-link:active { + background-color: #FFCF00; } -:-moz-handler-clicktoplay .hoverBox:hover, -:-moz-handler-clicktoplay .hoverBox:hover html|a, -:-moz-handler-clicktoplay .hoverBox:hover:active, -:-moz-handler-clicktoplay .hoverBox:hover:active html|a { - color: #FFCF00; +:-moz-handler-vulnerable-updatable .action-link { + background-color: #a81b0c; } - -:-moz-handler-clicktoplay .closeIcon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png"); +:-moz-handler-vulnerable-updatable .action-link:active { + background-color: #801409; } diff --git a/LCARStrek/mozapps/update/updates.css b/LCARStrek/mozapps/update/updates.css index 07c6656e..83203be7 100644 --- a/LCARStrek/mozapps/update/updates.css +++ b/LCARStrek/mozapps/update/updates.css @@ -46,6 +46,21 @@ wizardpage { -moz-margin-end: 6px; } +.inline-link { + color: #3333FF; + text-decoration: none; +} + +.inline-link:hover { + text-decoration: underline; +} + +/* Unsupported Page */ +#unsupportedLabel, #unsupportedLinkLabel { + -moz-margin-start: 0; + -moz-padding-start: 0; +} + /* Update Found Basic Page */ #updateName, #updateFinishedName { font-weight: bold; diff --git a/origdiff b/origdiff index b9d3709b..cc564807 100755 --- a/origdiff +++ b/origdiff @@ -30,7 +30,7 @@ COMM_LOG=$RUN_DIR/theme-suitedefault.$NAME_PRE-$NAME_POST.log HG_MOZ_DIR=/mnt/mozilla/hg/comm-beta/mozilla MOZ_HG_OPTIONS= -MOZ_DIR=toolkit/themes/windows/ +MOZ_DIR="toolkit/themes/windows/ toolkit/themes/shared/" MOZ_TAG_PRE=$TAG_PRE_MOZ MOZ_TAG_POST=$TAG_POST_MOZ MOZ_NAME_EXTRA=" (toolkit)" @@ -38,7 +38,7 @@ MOZ_LOG=$RUN_DIR/theme-toolkitwin.$NAME_PRE-$NAME_POST.log HG_MOZB_DIR=/mnt/mozilla/hg/comm-beta/mozilla MOZB_HG_OPTIONS= -MOZB_DIR=browser/themes/windows/ +MOZB_DIR="browser/themes/windows/ browser/themes/shared/" MOZB_TAG_PRE=$TAG_PRE_MOZ MOZB_TAG_POST=$TAG_POST_MOZ MOZB_NAME_EXTRA=" (browser)" -- 2.35.3