From: Robert Kaiser Date: Sun, 9 Feb 2014 19:53:09 +0000 (+0100) Subject: sync both themes to suite classic theme changes in SeaMonkey 2.25 cycle X-Git-Tag: LCARStrek-2.25~9 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=e64883579c16c1c431ffd39cb7af0d551e10dd6f;hp=114c63a29de43bf0fab87ddb948eadd3b0f9a328 sync both themes to suite classic theme changes in SeaMonkey 2.25 cycle --- diff --git a/EarlyBlue/communicator/aboutPrivateBrowsing.css b/EarlyBlue/communicator/aboutPrivateBrowsing.css new file mode 100644 index 00000000..bc2cfe4b --- /dev/null +++ b/EarlyBlue/communicator/aboutPrivateBrowsing.css @@ -0,0 +1,62 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* Hide selected items by default and display them based on the page status */ + +#warningBox:not(.private) .private, +#warningBox:not(.normal) .normal { + display: none; +} + +/* Pick the desired icons depending on the window's context */ + +#warningBox.private > #warningBoxIcon { + list-style-image: url("chrome://global/skin/icons/information-48.png"); + width: 48px; + height: 48px; + -moz-margin-end: 3em; +} + +#warningBox.normal > #warningBoxIcon { + list-style-image: url("chrome://global/skin/icons/question-48.png"); + width: 48px; + height: 48px; + -moz-margin-end: 3em; +} + +#trackWarnBox { + margin-top: 0.6em; + -moz-margin-end: 7em; + -moz-box-align: center; +} + +#trackWarnIcon { + list-style-image: url("chrome://global/skin/icons/warning-24.png"); + width: 24px; + height: 24px; +} + +/* Define additional styles to look similar to the netError/certError pages */ + +#warningTitle { + font-weight: bold; +} + +#warningStatus { + margin: 0.4em 0 1.2em 0; + padding-bottom: 1.2em; + border-bottom: 1px solid #808080; + font-size: 135%; +} + +#warningInnerBox > button { + margin: 0.8em 0 1em 0; +} + +#warningOuterBox > vbox > label, +#warningInnerBox > description { + -moz-margin-start: 0; +} diff --git a/EarlyBlue/global/icons/information-48.png b/EarlyBlue/global/icons/information-48.png new file mode 100644 index 00000000..ce3b7575 Binary files /dev/null and b/EarlyBlue/global/icons/information-48.png differ diff --git a/EarlyBlue/global/icons/question-48.png b/EarlyBlue/global/icons/question-48.png new file mode 100644 index 00000000..37d76914 Binary files /dev/null and b/EarlyBlue/global/icons/question-48.png differ diff --git a/EarlyBlue/global/icons/warning-24.png b/EarlyBlue/global/icons/warning-24.png new file mode 100644 index 00000000..a7a667a5 Binary files /dev/null and b/EarlyBlue/global/icons/warning-24.png differ diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index 51276bd5..3a700c2c 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -42,6 +42,10 @@ background-image: url("chrome://global/skin/media/noAudio.png"); } +.muteButton[noAudio] + .volumeStack { + display: none; +} + .fullscreenButton { background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0); } @@ -50,35 +54,25 @@ background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16); } -.volumeStack { - width: 28px; - height: 70px; - background-color: rgba(102,102,153,0.74); - /* use negative margin to place stack over the mute button to its left. */ - margin: -70px 3px 28px -31px; - overflow: hidden; /* crop it when sliding down, don't grow the control bar */ - position: relative; /* Trick to work around negative margin interfering with dragging the thumb. */ - padding-top: 6px; +.volumeControl { + width: 32px; + opacity: 0; } -.volumeControl { - min-height: 64px; +.volumeBackground, +.volumeForeground { + background-repeat: no-repeat; + background-position: center; + width: 32px; } -/* .scale-thumb is an element inside the implementation. */ -.volumeControl .scale-thumb { - /* Override the default thumb appearance with a custom image. */ - -moz-appearance: none; - background: url("chrome://global/skin/media/volumeThumb.png") no-repeat center; - border: none !important; - min-width: 20px; - min-height: 10px; +.volumeBackground { + background-image: url("chrome://global/skin/media/volume-empty.png"); } -.volumeBackgroundBar { - /* margin left/right: make bar 8px wide (control width = 28, minus 2 * 10 margin) */ - margin: 0px 10px; - background-color: rgba(0,0,0,0.5); +.volumeForeground { + background-image: url("chrome://global/skin/media/volume-full.png"); + background-clip: content-box; } .durationBox { @@ -145,7 +139,8 @@ } /* .scale-thumb is an element inside the implementation. */ -.scrubber .scale-thumb { +.scrubber .scale-thumb, +.volumeControl .scale-thumb { /* Override the default thumb appearance with a custom image. */ background: transparent; border: none !important; diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css index 3a68c61a..15f60348 100644 --- a/EarlyBlue/messenger/messengercompose/messengercompose.css +++ b/EarlyBlue/messenger/messengercompose/messengercompose.css @@ -187,6 +187,12 @@ treechildren::-moz-tree-image(remote-err) { border-top: none; } +treechildren::-moz-tree-image(subscribed-news) { + -moz-margin-start: 2px; + -moz-margin-end: -3px; + list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png"); +} + /* ::::: lightweight themes ::::: */ #MsgHeadersToolbar:-moz-lwtheme, diff --git a/LCARStrek/communicator/aboutPrivateBrowsing.css b/LCARStrek/communicator/aboutPrivateBrowsing.css new file mode 100644 index 00000000..2c95ac58 --- /dev/null +++ b/LCARStrek/communicator/aboutPrivateBrowsing.css @@ -0,0 +1,62 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* Hide selected items by default and display them based on the page status */ + +#warningBox:not(.private) .private, +#warningBox:not(.normal) .normal { + display: none; +} + +/* Pick the desired icons depending on the window's context */ + +#warningBox.private > #warningBoxIcon { + list-style-image: url("chrome://global/skin/icons/information-48.png"); + width: 48px; + height: 48px; + -moz-margin-end: 3em; +} + +#warningBox.normal > #warningBoxIcon { + list-style-image: url("chrome://global/skin/icons/question-48.png"); + width: 48px; + height: 48px; + -moz-margin-end: 3em; +} + +#trackWarnBox { + margin-top: 0.6em; + -moz-margin-end: 7em; + -moz-box-align: center; +} + +#trackWarnIcon { + list-style-image: url("chrome://global/skin/icons/warning-24.png"); + width: 24px; + height: 24px; +} + +/* Define additional styles to look similar to the netError/certError pages */ + +#warningTitle { + font-weight: bold; +} + +#warningStatus { + margin: 0.4em 0 1.2em 0; + padding-bottom: 1.2em; + border-bottom: 1px solid #9C9CFF; + font-size: 135%; +} + +#warningInnerBox > button { + margin: 0.8em 0 1em 0; +} + +#warningOuterBox > vbox > label, +#warningInnerBox > description { + -moz-margin-start: 0; +} diff --git a/LCARStrek/global/icons/alert-exclam.gif b/LCARStrek/global/icons/alert-exclam.gif index ceb1a3dc..8b031f26 100755 Binary files a/LCARStrek/global/icons/alert-exclam.gif and b/LCARStrek/global/icons/alert-exclam.gif differ diff --git a/LCARStrek/global/icons/information-48.png b/LCARStrek/global/icons/information-48.png new file mode 100644 index 00000000..016a6279 Binary files /dev/null and b/LCARStrek/global/icons/information-48.png differ diff --git a/LCARStrek/global/icons/question-16.png b/LCARStrek/global/icons/question-16.png index 3df227e9..a5b9b849 100644 Binary files a/LCARStrek/global/icons/question-16.png and b/LCARStrek/global/icons/question-16.png differ diff --git a/LCARStrek/global/icons/question-48.png b/LCARStrek/global/icons/question-48.png new file mode 100644 index 00000000..cef58f94 Binary files /dev/null and b/LCARStrek/global/icons/question-48.png differ diff --git a/LCARStrek/global/icons/question-64.png b/LCARStrek/global/icons/question-64.png index 461e6e7a..9bdd8fc1 100644 Binary files a/LCARStrek/global/icons/question-64.png and b/LCARStrek/global/icons/question-64.png differ diff --git a/LCARStrek/global/icons/warning-24.png b/LCARStrek/global/icons/warning-24.png new file mode 100644 index 00000000..8d9f42f2 Binary files /dev/null and b/LCARStrek/global/icons/warning-24.png differ diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index d9acf361..76a34ef3 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -76,6 +76,10 @@ background-image: url("chrome://global/skin/media/noAudio.png"); } +.muteButton[noAudio] + .volumeStack { + display: none; +} + .fullscreenButton { background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0); } @@ -92,40 +96,25 @@ background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 16, 32, 32, 16); } -.volumeStack { - width: 28px; - height: 70px; - background-color: rgba(156,156,255,0.74); - /* use negative margin to place stack over the mute button to its left. */ - margin: -70px 3px 28px -31px; - overflow: hidden; /* crop it when sliding down, don't grow the control bar */ - position: relative; /* Trick to work around negative margin interfering with dragging the thumb. */ - padding-top: 6px; - border-radius: 3px 3px 0 0; -} - .volumeControl { - min-height: 64px; + width: 32px; + opacity: 0; } -/* .scale-thumb is an element inside the implementation. */ -.volumeControl .scale-thumb { - /* Override the default thumb appearance with a custom image. */ - -moz-appearance: none; - background: url("chrome://global/skin/media/volumeThumb.png") no-repeat center; - border: none !important; - min-width: 20px; - min-height: 10px; +.volumeBackground, +.volumeForeground { + background-repeat: no-repeat; + background-position: center; + width: 32px; } -.volumeControl .scale-thumb:hover, .volumeControl .scale-thumb:active { - background-image: url("chrome://global/skin/media/volumeThumb-hover.png"); + +.volumeBackground { + background-image: url("chrome://global/skin/media/volume-empty.png"); } -.volumeBackgroundBar { - /* margin left/right: make bar 8px wide (control width = 28, minus 2 * 10 margin) */ - margin: 0px 10px; - background-color: rgba(0,0,0,0.5); - border-radius: 2.5px; +.volumeForeground { + background-image: url("chrome://global/skin/media/volume-full.png"); + background-clip: content-box; } .durationBox { @@ -195,7 +184,8 @@ } /* .scale-thumb is an element inside the implementation. */ -.scrubber .scale-thumb { +.scrubber .scale-thumb, +.volumeControl .scale-thumb { /* Override the default thumb appearance with a custom image. */ background: transparent; border: none !important; diff --git a/LCARStrek/messenger/messengercompose/messengercompose.css b/LCARStrek/messenger/messengercompose/messengercompose.css index 886391be..70dcef3e 100644 --- a/LCARStrek/messenger/messengercompose/messengercompose.css +++ b/LCARStrek/messenger/messengercompose/messengercompose.css @@ -271,6 +271,12 @@ treechildren::-moz-tree-image(remote-err) { border: none; } +treechildren::-moz-tree-image(subscribed-news) { + -moz-margin-start: 2px; + -moz-margin-end: -3px; + list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png"); +} + /* ::::: lightweight themes ::::: */ #MsgHeadersToolbar:-moz-lwtheme,