From c60d23d202dd9e6ec3e47e1c54e20329d0afb68b Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 8 Jul 2012 22:20:58 +0200 Subject: [PATCH] sync both themes with toolkit winstripe changes in Mozilla 14 --- EarlyBlue/global/TopLevelImageDocument.css | 13 ++++++++++++ EarlyBlue/global/TopLevelVideoDocument.css | 11 ++++++++++ EarlyBlue/global/notification.css | 7 ++++--- .../plugins/contentPluginClickToPlay.png | Bin 0 -> 253 bytes EarlyBlue/mozapps/plugins/pluginProblem.css | 19 +++++++++++++++++- LCARStrek/global/TopLevelImageDocument.css | 13 ++++++++++++ LCARStrek/global/TopLevelVideoDocument.css | 11 ++++++++++ LCARStrek/global/notification.css | 7 ++++--- .../plugins/contentPluginClickToPlay.png | Bin 0 -> 253 bytes LCARStrek/mozapps/plugins/pluginProblem.css | 19 +++++++++++++++++- 10 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 EarlyBlue/global/TopLevelImageDocument.css create mode 100644 EarlyBlue/global/TopLevelVideoDocument.css create mode 100644 EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png create mode 100644 LCARStrek/global/TopLevelImageDocument.css create mode 100644 LCARStrek/global/TopLevelVideoDocument.css create mode 100644 LCARStrek/mozapps/plugins/contentPluginClickToPlay.png diff --git a/EarlyBlue/global/TopLevelImageDocument.css b/EarlyBlue/global/TopLevelImageDocument.css new file mode 100644 index 00000000..31f2662a --- /dev/null +++ b/EarlyBlue/global/TopLevelImageDocument.css @@ -0,0 +1,13 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@media not print { + body { + background-color: #222; + } + + img { + color: #eee; + } +} diff --git a/EarlyBlue/global/TopLevelVideoDocument.css b/EarlyBlue/global/TopLevelVideoDocument.css new file mode 100644 index 00000000..0d5dabdd --- /dev/null +++ b/EarlyBlue/global/TopLevelVideoDocument.css @@ -0,0 +1,11 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +body { + background-color: #333; +} + +video { + box-shadow: 0 0 15px #000; +} diff --git a/EarlyBlue/global/notification.css b/EarlyBlue/global/notification.css index 08d54c30..9ade78d4 100644 --- a/EarlyBlue/global/notification.css +++ b/EarlyBlue/global/notification.css @@ -27,14 +27,15 @@ notification[type="critical"] { /* Default icons for notifications */ -notification[type="info"] .messageImage { +.messageImage[type="info"] { list-style-image: url("chrome://global/skin/icons/information-16.png"); } -notification[type="warning"] .messageImage { + +.messageImage[type="warning"] { list-style-image: url("chrome://global/skin/icons/warning-16.png"); } -notification[type="critical"] .messageImage { +.messageImage[type="critical"] { list-style-image: url("chrome://global/skin/icons/error-16.png"); } diff --git a/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png b/EarlyBlue/mozapps/plugins/contentPluginClickToPlay.png new file mode 100644 index 0000000000000000000000000000000000000000..2702cc4d860618f7b3659bc2e50487fd4c1d494b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css index e5efea31..23d0f40e 100644 --- a/EarlyBlue/mozapps/plugins/pluginProblem.css +++ b/EarlyBlue/mozapps/plugins/pluginProblem.css @@ -30,7 +30,7 @@ html|a { background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } :-moz-handler-clicktoplay .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginClickToPlay.png"); } :-moz-handler-disabled .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); @@ -53,6 +53,23 @@ html|a { cursor: default; } +:-moz-handler-clicktoplay, +.msgClickToPlay { + cursor: pointer; +} + +@media not all and (-moz-touch-enabled) { + :-moz-handler-clicktoplay .msgTapToPlay { + display: none; + } +} + +@media (-moz-touch-enabled) { + :-moz-handler-clicktoplay .msgClickToPlay { + display: none; + } +} + .submitStatus div { min-height: 19px; /* height of biggest line (with throbber) */ } diff --git a/LCARStrek/global/TopLevelImageDocument.css b/LCARStrek/global/TopLevelImageDocument.css new file mode 100644 index 00000000..31f2662a --- /dev/null +++ b/LCARStrek/global/TopLevelImageDocument.css @@ -0,0 +1,13 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@media not print { + body { + background-color: #222; + } + + img { + color: #eee; + } +} diff --git a/LCARStrek/global/TopLevelVideoDocument.css b/LCARStrek/global/TopLevelVideoDocument.css new file mode 100644 index 00000000..0d5dabdd --- /dev/null +++ b/LCARStrek/global/TopLevelVideoDocument.css @@ -0,0 +1,11 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +body { + background-color: #333; +} + +video { + box-shadow: 0 0 15px #000; +} diff --git a/LCARStrek/global/notification.css b/LCARStrek/global/notification.css index bf7b4dc5..b4b541f1 100644 --- a/LCARStrek/global/notification.css +++ b/LCARStrek/global/notification.css @@ -24,14 +24,15 @@ notification[type="critical"] { /* Default icons for notifications */ -notification[type="info"] .messageImage { +.messageImage[type="info"] { list-style-image: url("chrome://global/skin/icons/information-16.png"); } -notification[type="warning"] .messageImage { + +.messageImage[type="warning"] { list-style-image: url("chrome://global/skin/icons/warning-16.png"); } -notification[type="critical"] .messageImage { +.messageImage[type="critical"] { list-style-image: url("chrome://global/skin/icons/error-16.png"); } diff --git a/LCARStrek/mozapps/plugins/contentPluginClickToPlay.png b/LCARStrek/mozapps/plugins/contentPluginClickToPlay.png new file mode 100644 index 0000000000000000000000000000000000000000..892c5f7cbb6afa5ec18305edb5febf49512808c9 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDH3?y^UWFG-ijKx9jP7LeL$-D$|*aCb)T!C~$ zzy{L}pXng!k|4ie28U-i(mT$WAJqKb6Mw<&;$VayiczH literal 0 HcmV?d00001 diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css index 98e325b2..1a04f071 100644 --- a/LCARStrek/mozapps/plugins/pluginProblem.css +++ b/LCARStrek/mozapps/plugins/pluginProblem.css @@ -30,7 +30,7 @@ html|a { background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png"); } :-moz-handler-clicktoplay .icon { - background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png"); + background-image: url("chrome://mozapps/skin/plugins/contentPluginClickToPlay.png"); } :-moz-handler-disabled .icon { background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png"); @@ -53,6 +53,23 @@ html|a { cursor: default; } +:-moz-handler-clicktoplay, +.msgClickToPlay { + cursor: pointer; +} + +@media not all and (-moz-touch-enabled) { + :-moz-handler-clicktoplay .msgTapToPlay { + display: none; + } +} + +@media (-moz-touch-enabled) { + :-moz-handler-clicktoplay .msgClickToPlay { + display: none; + } +} + .submitStatus div { min-height: 19px; /* height of biggest line (with throbber) */ } -- 2.43.0