From: Robert Kaiser Date: Sun, 3 May 2009 21:08:45 +0000 (+0200) Subject: update both themes for toolkit winstripe changes between 2009-02-23 and 2009-05-01 X-Git-Tag: LCARStrek-2.0b1~10 X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=commitdiff_plain;h=ca710c53d5db01958c0a42128462487e4229c94f update both themes for toolkit winstripe changes between 2009-02-23 and 2009-05-01 --- diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css index c86773d2..86d4cf89 100644 --- a/EarlyBlue/global/autocomplete.css +++ b/EarlyBlue/global/autocomplete.css @@ -151,7 +151,10 @@ panel[type="autocomplete-richlistbox"], .autocomplete-richlistitem { padding: 1px 2px; - border-bottom: 1px solid #666699; +} + +.autocomplete-richlistitem:not(:first-child) { + border-top: 1px solid #666699; } .ac-site-icon { diff --git a/EarlyBlue/global/dirListing/dirListing.css b/EarlyBlue/global/dirListing/dirListing.css index c122145e..457454d2 100644 --- a/EarlyBlue/global/dirListing/dirListing.css +++ b/EarlyBlue/global/dirListing/dirListing.css @@ -19,6 +19,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Ehsan Akhgari * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -77,11 +78,19 @@ p { float: left; } +body[dir="rtl"] #UI_goUp { + float: right; +} + #UI_showHidden { margin-top: 0; float: right; } +body[dir="rtl"] #UI_showHidden { + float: left; +} + table { clear: both; width: 90%; @@ -94,7 +103,7 @@ thead { /* last modified */ th:first-child { - text-align: center; + text-align: center !important; } th:hover > a { diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 4cedc1fc..709dd0ed 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -154,10 +154,6 @@ statusbarpanel { padding: 0px 1px; } -resizer[dir="bottomright"] { - cursor: se-resize; -} - window:not([active="true"]) menubar > menu { color: #808080; } diff --git a/EarlyBlue/global/media/scrubberThumb.png b/EarlyBlue/global/media/scrubberThumb.png index bac1b1ae..10363f25 100644 Binary files a/EarlyBlue/global/media/scrubberThumb.png and b/EarlyBlue/global/media/scrubberThumb.png differ diff --git a/EarlyBlue/global/media/scrubberThumbWide.png b/EarlyBlue/global/media/scrubberThumbWide.png new file mode 100644 index 00000000..4dc4cece Binary files /dev/null and b/EarlyBlue/global/media/scrubberThumbWide.png differ diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index 371a98e3..a6d708c9 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -17,6 +17,8 @@ } .playButton { min-width: 28px; + margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */ + position: relative; /* Trick to work around negative margin interfering with clicking on the button. */ } .muteButton { min-width: 33px; @@ -36,15 +38,61 @@ background-image: url("chrome://global/skin/media/unmuteButton.png"); } +.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 { + min-height: 64px; +} + +/* .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: 16px; + min-height: 11px; +} + +.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); +} + + +.durationBox { + -moz-box-pack: center; +} + +.durationLabel { + margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */ + padding-left: 8px; /* don't bump into the scrubber bar */ + padding-top: 0px; /* center vertically with scrubber bar */ + color: rgba(204,208,221,0.75); + font: 11px sans-serif; +} + .backgroundBar { - /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - margin: 10px 2px; + /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ + /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ + margin: 10px 22px; background-color: rgba(0,0,0,0.75); } .bufferBar, .progressBar { - /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - margin: 10px 2px; + /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ + /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ + margin: 10px 22px; border: none; background-color: transparent; min-width: 0px; @@ -68,17 +116,67 @@ } /* .scale-slider is an element inside the implementation. */ -.scale-slider { +.scrubber .scale-slider, .volumeControl .scale-slider { /* Hide the default horizontal bar. */ background: none; - margin: 0 2px; + margin: 0; +} + +.scrubber .scale-slider { + /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ + margin-top: -9px; + margin-bottom: 10px; } /* .scale-thumb is an element inside the implementation. */ -.scale-thumb { +.scrubber .scale-thumb { /* Override the default thumb appearance with a custom image. */ - background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; + background: transparent; border: none !important; - min-width: 11px; - min-height: 20px; +} + +.timeThumb { + background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; + min-width: 45px; + min-height: 27px; + -moz-box-pack: center; +} + +.timeThumb[showhours="true"] { + background: url("chrome://global/skin/media/scrubberThumbWide.png") no-repeat center; +} + +/* +.timeThumb:hover, .timeThumb:active { + background-image: url("chrome://global/skin/media/scrubberThumb-hover.png"); +} +*/ + +.timeLabel { + color: rgba(0,0,0,0.75); + font: 10px sans-serif; + text-shadow: rgba(102,102,153, 0.3) 0 1px; + padding-top: 2px; +} + +.timeThumb[showhours="true"] > .timeLabel { + padding-top: 1px; +} + +.statusOverlay { + background-color: rgba(0,0,0,0.55); +} + +.statusIcon { + margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */ + width: 32px; + height: 32px; +} + +.statusIcon[type="throbber"] { + background: url("chrome://communicator/skin/brand/throbber-anim.gif") no-repeat center; +} + +.statusIcon[type="error"] { + background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; } diff --git a/EarlyBlue/global/media/volumeThumb.png b/EarlyBlue/global/media/volumeThumb.png new file mode 100644 index 00000000..5e1c3f13 Binary files /dev/null and b/EarlyBlue/global/media/volumeThumb.png differ diff --git a/EarlyBlue/global/notification.css b/EarlyBlue/global/notification.css index 8362963a..6d17a07b 100644 --- a/EarlyBlue/global/notification.css +++ b/EarlyBlue/global/notification.css @@ -37,12 +37,12 @@ notification[type="critical"] .messageImage { list-style-image: url("chrome://global/skin/icons/error-16.png"); } -.messageText { - -moz-margin-start: 5px; -} - .messageCloseButton { list-style-image: url("chrome://global/skin/icons/close-button.gif"); padding: 4px 2px; border: none; } + +.messageCloseButton > .toolbarbutton-icon { + -moz-margin-start: 5px; +} diff --git a/EarlyBlue/global/tabbox.css b/EarlyBlue/global/tabbox.css index 6d00c6ac..9d5547e7 100644 --- a/EarlyBlue/global/tabbox.css +++ b/EarlyBlue/global/tabbox.css @@ -93,7 +93,7 @@ tab:focus > .tab-middle { } /* -tab[first-tab="true"][selected="true"] { +tab:first-of-type[selected="true"] { -moz-padding-end: 5px; -moz-padding-start: 5px; } diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css index 4ec3c75c..59a76908 100644 --- a/EarlyBlue/global/toolbarbutton.css +++ b/EarlyBlue/global/toolbarbutton.css @@ -55,7 +55,8 @@ toolbarbutton { color: #000000; } -.toolbarbutton-icon { +.toolbarbutton-icon[label]:not([label=""]), +.toolbarbutton-icon[type="menu"] { -moz-margin-end: 2px; } diff --git a/LCARStrek/global/autocomplete.css b/LCARStrek/global/autocomplete.css index ccadf73c..975c77b8 100644 --- a/LCARStrek/global/autocomplete.css +++ b/LCARStrek/global/autocomplete.css @@ -151,7 +151,10 @@ panel[type="autocomplete-richlistbox"], .autocomplete-richlistitem { padding: 1px 2px; - border-bottom: 1px solid #E7ADE7; +} + +.autocomplete-richlistitem:not(:first-child) { + border-top: 1px solid #E7ADE7; } .ac-site-icon { diff --git a/LCARStrek/global/dirListing/dirListing.css b/LCARStrek/global/dirListing/dirListing.css index 28efb968..2da4f02e 100644 --- a/LCARStrek/global/dirListing/dirListing.css +++ b/LCARStrek/global/dirListing/dirListing.css @@ -19,6 +19,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Ehsan Akhgari * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -78,11 +79,19 @@ p { float: left; } +body[dir="rtl"] #UI_goUp { + float: right; +} + #UI_showHidden { margin-top: 0; float: right; } +body[dir="rtl"] #UI_showHidden { + float: left; +} + table { clear: both; width: 90%; @@ -95,7 +104,7 @@ thead { /* last modified */ th:first-child { - text-align: center; + text-align: center !important; } th:hover > a { diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index ccb3dec0..444b46da 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -194,10 +194,6 @@ statusbarpanel { padding: 0px 1px; } -resizer[dir="bottomright"] { - cursor: se-resize; -} - window:not([active="true"]) menubar > menu { color: #8050B0; } diff --git a/LCARStrek/global/media/scrubberThumb-hover.png b/LCARStrek/global/media/scrubberThumb-hover.png deleted file mode 100644 index 82c9c01d..00000000 Binary files a/LCARStrek/global/media/scrubberThumb-hover.png and /dev/null differ diff --git a/LCARStrek/global/media/scrubberThumb.png b/LCARStrek/global/media/scrubberThumb.png index 052d7c54..43087bcf 100644 Binary files a/LCARStrek/global/media/scrubberThumb.png and b/LCARStrek/global/media/scrubberThumb.png differ diff --git a/LCARStrek/global/media/scrubberThumbWide.png b/LCARStrek/global/media/scrubberThumbWide.png new file mode 100644 index 00000000..4097940e Binary files /dev/null and b/LCARStrek/global/media/scrubberThumbWide.png differ diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 149c0dee..474933d6 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -17,6 +17,8 @@ } .playButton { min-width: 28px; + margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */ + position: relative; /* Trick to work around negative margin interfering with clicking on the button. */ } .muteButton { min-width: 33px; @@ -55,16 +57,66 @@ background-image: url("chrome://global/skin/media/unmuteButton-hover.png"); } +.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; +} + +.volumeControl { + min-height: 64px; +} + +/* .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: 16px; + min-height: 11px; +} +.volumeControl .scale-thumb:hover, .volumeControl .scale-thumb:active { + background-image: url("chrome://global/skin/media/volumeThumb-hover.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); + -moz-border-radius: 4px 4px; +} + + +.durationBox { + -moz-box-pack: center; +} + +.durationLabel { + margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */ + padding-left: 8px; /* don't bump into the scrubber bar */ + padding-top: 0px; /* center vertically with scrubber bar */ + color: rgba(0,0,0,0.75); + font: 11px sans-serif; +} + .backgroundBar { - /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - margin: 10px 2px; + /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ + /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ + margin: 10px 22px; background-color: rgba(0,0,0,0.75); - -moz-border-radius: 3px 3px; + -moz-border-radius: 4px 4px; } .bufferBar, .progressBar { - /* make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - margin: 10px 2px; + /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ + /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ + margin: 10px 22px; border: none; background-color: transparent; min-width: 0px; @@ -79,32 +131,78 @@ * compositing gives it a different visual appearance. */ background-color: rgba(255,159,0,0.75); - -moz-border-radius: 3px 3px; + -moz-border-radius: 4px 4px; -moz-appearance: none; } .progressBar .progress-bar { background-color: #008484; - -moz-border-radius: 3px 3px; + -moz-border-radius: 4px 0px 0px 4px; -moz-appearance: none; } /* .scale-slider is an element inside the implementation. */ -.scale-slider { +.scrubber .scale-slider, .volumeControl .scale-slider { /* Hide the default horizontal bar. */ background: none; - margin: 0 2px; + margin: 0; +} + +.scrubber .scale-slider { + /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ + margin-top: -9px; + margin-bottom: 10px; } /* .scale-thumb is an element inside the implementation. */ -.scale-thumb { +.scrubber .scale-thumb { /* Override the default thumb appearance with a custom image. */ - background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; + background: transparent; border: none !important; - min-width: 11px; - min-height: 20px; } -.scale-thumb:hover, .scale-thumb:active { +.timeThumb { + background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; + min-width: 45px; + min-height: 27px; + -moz-box-pack: center; +} + +.timeThumb[showhours="true"] { + background: url("chrome://global/skin/media/scrubberThumbWide.png") no-repeat center; +} + +/* +.timeThumb:hover, .timeThumb:active { background-image: url("chrome://global/skin/media/scrubberThumb-hover.png"); } +*/ + +.timeLabel { + color: rgba(0,0,0,0.75); + font: 10px sans-serif; + text-shadow: rgba(255,259,0, 0.3) 0 1px; + padding-top: 2px; +} + +.timeThumb[showhours="true"] > .timeLabel { + padding-top: 1px; +} + +.statusOverlay { + background-color: rgba(0,0,0,0.55); +} + +.statusIcon { + margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */ + width: 36px; + height: 36px; +} + +.statusIcon[type="throbber"] { + background: url("chrome://communicator/skin/brand/throbber-anim.gif") no-repeat center; +} + +.statusIcon[type="error"] { + background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; +} diff --git a/LCARStrek/global/media/volumeThumb-hover.png b/LCARStrek/global/media/volumeThumb-hover.png new file mode 100644 index 00000000..718f27de Binary files /dev/null and b/LCARStrek/global/media/volumeThumb-hover.png differ diff --git a/LCARStrek/global/media/volumeThumb.png b/LCARStrek/global/media/volumeThumb.png new file mode 100644 index 00000000..2bf08037 Binary files /dev/null and b/LCARStrek/global/media/volumeThumb.png differ diff --git a/LCARStrek/global/notification.css b/LCARStrek/global/notification.css index cbe1a5cf..86e321f5 100644 --- a/LCARStrek/global/notification.css +++ b/LCARStrek/global/notification.css @@ -34,10 +34,6 @@ notification[type="critical"] .messageImage { list-style-image: url("chrome://global/skin/icons/error-16.png"); } -.messageText { - -moz-margin-start: 5px; -} - .notification-inner { -moz-margin-start: 8px; -moz-margin-end: 12px; @@ -53,3 +49,7 @@ notification[type="critical"] .messageImage { .messageCloseButton:hover:active { list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); } + +.messageCloseButton > .toolbarbutton-icon { + -moz-margin-start: 5px; +} diff --git a/LCARStrek/global/tabbox.css b/LCARStrek/global/tabbox.css index 936afbf8..f6e270e0 100644 --- a/LCARStrek/global/tabbox.css +++ b/LCARStrek/global/tabbox.css @@ -101,7 +101,7 @@ tab:focus > .tab-middle { } /* -tab[first-tab="true"][selected="true"] { +tab:first-of-type[selected="true"] { -moz-padding-end: 5px; -moz-padding-start: 5px; } diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index 198155ea..5e415927 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -57,7 +57,8 @@ toolbarbutton { color: #FFCF00; } -.toolbarbutton-icon { +.toolbarbutton-icon[label]:not([label=""]), +.toolbarbutton-icon[type="menu"] { -moz-margin-start: 1px; -moz-margin-end: 2px; }