From: Robert Kaiser Date: Thu, 8 Aug 2013 00:54:19 +0000 (+0200) Subject: update both themes for toolkit windows theme changes in Mozilla 24 cycle X-Git-Tag: LCARStrek-2.21~6 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=25fe52645ef988436b57074ab129945504adf926;hp=c4affa52f0de77abdffd5ea5764ce432a012bf82 update both themes for toolkit windows theme changes in Mozilla 24 cycle --- 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 00000000..b0cb741f Binary files /dev/null and b/EarlyBlue/mozapps/plugins/contentPluginActivate.png differ diff --git a/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png b/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png deleted file mode 100644 index 2702cc4d..00000000 Binary files a/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png and /dev/null differ diff --git a/EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png b/EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png deleted file mode 100644 index a02a59c3..00000000 Binary files a/EarlyBlue/mozapps/plugins/contentPluginClickToPlayPlain.png and /dev/null differ diff --git a/EarlyBlue/mozapps/plugins/contentPluginClose.png b/EarlyBlue/mozapps/plugins/contentPluginClose.png new file mode 100644 index 00000000..c2b62627 Binary files /dev/null and b/EarlyBlue/mozapps/plugins/contentPluginClose.png differ diff --git a/EarlyBlue/mozapps/plugins/notifyPluginBlocked.png b/EarlyBlue/mozapps/plugins/notifyPluginBlocked.png deleted file mode 100644 index 83ddf233..00000000 Binary files a/EarlyBlue/mozapps/plugins/notifyPluginBlocked.png and /dev/null differ diff --git a/EarlyBlue/mozapps/plugins/notifyPluginOutdated.png b/EarlyBlue/mozapps/plugins/notifyPluginOutdated.png deleted file mode 100644 index 8e0cbd19..00000000 Binary files a/EarlyBlue/mozapps/plugins/notifyPluginOutdated.png and /dev/null differ diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css index 5c29c101..adfd81e3 100644 --- a/EarlyBlue/mozapps/plugins/pluginProblem.css +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -8,18 +8,33 @@ .mainBox { text-align: center; + display: table; + width: 100%; + height: 100%; background-color: #CCD0DD; color: #000000; - border-radius: 12px; - /* recessed effect with 'disabled' shadow */ - box-shadow: inset 0 1px 5px #808080; - 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: #CCCCCC; +} + +:-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"); @@ -44,24 +61,19 @@ html|a { } :-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"); } @@ -72,19 +84,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; @@ -160,41 +159,30 @@ html|a { right: 4px; border: none; background-color: transparent; - background-image: url("chrome://global/skin/icons/close-button.gif"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png"); background-repeat: no-repeat; } -.closeIcon:-moz-locale-dir(rtl) { +.mainBox[chromedir="rtl"] .closeIcon { right: auto; left: 4px; } -:-moz-handler-clicktoplay .mainBox { - background-image: none; - background-color: rgba(255, 255, 255, .2); - border: 1px dashed rgba(128, 128, 128, 0.5); - color: #808080; - 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(255, 255, 255, .8); +.action-link { + display: inline-block; + border-radius: 10px; + background-color: #9999CC; + padding: 2px 8px; + margin-top: 7px; + text-decoration: none; } - -:-moz-handler-clicktoplay .mainBox, -:-moz-handler-clicktoplay html|a { - color: #000000; +.action-link:active { + background-color: #666699; } -:-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 { +:-moz-handler-vulnerable-updatable .action-link { + background-color: #CCCC60; } - -:-moz-handler-clicktoplay .closeIcon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginClose.png"); +:-moz-handler-vulnerable-updatable .action-link:active { + background-color: #AAAA40; } diff --git a/EarlyBlue/mozapps/update/updates.css b/EarlyBlue/mozapps/update/updates.css index 94ae5c33..aa656097 100644 --- a/EarlyBlue/mozapps/update/updates.css +++ b/EarlyBlue/mozapps/update/updates.css @@ -46,6 +46,21 @@ wizardpage { -moz-margin-end: 6px; } +.inline-link { + color: blue; + 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/LCARStrek/mozapps/plugins/notifyPluginBlocked.png b/LCARStrek/browser/notifyPluginBlocked.png similarity index 100% rename from LCARStrek/mozapps/plugins/notifyPluginBlocked.png rename to LCARStrek/browser/notifyPluginBlocked.png diff --git a/LCARStrek/mozapps/plugins/notifyPluginOutdated.png b/LCARStrek/browser/notifyPluginOutdated.png similarity index 100% rename from LCARStrek/mozapps/plugins/notifyPluginOutdated.png rename to LCARStrek/browser/notifyPluginOutdated.png diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css index 937dcc55..61905f47 100644 --- a/LCARStrek/global/toolbar.css +++ b/LCARStrek/global/toolbar.css @@ -142,13 +142,6 @@ toolbarpaletteitem { background-color: #000000 !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; } @@ -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 00000000..a107b6bf Binary files /dev/null and b/LCARStrek/mozapps/plugins/contentPluginActivate.png differ diff --git a/LCARStrek/mozapps/plugins/contentPluginClickToPlay.png b/LCARStrek/mozapps/plugins/contentPluginClickToPlay.png deleted file mode 100644 index 892c5f7c..00000000 Binary files a/LCARStrek/mozapps/plugins/contentPluginClickToPlay.png and /dev/null differ diff --git a/LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png b/LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png deleted file mode 100644 index 69feb08d..00000000 Binary files a/LCARStrek/mozapps/plugins/contentPluginClickToPlayPlain.png and /dev/null differ diff --git a/LCARStrek/mozapps/plugins/contentPluginClose.png b/LCARStrek/mozapps/plugins/contentPluginClose.png index 094deac5..b42c158d 100644 Binary files a/LCARStrek/mozapps/plugins/contentPluginClose.png and b/LCARStrek/mozapps/plugins/contentPluginClose.png differ 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)"