From 3327253ed3b6be3c4cc98847e444c55f9a268d45 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 25 Jul 2010 20:57:47 +0200 Subject: [PATCH] update both themes for toolkit winstripe changes up to 2010-07-25 --- EarlyBlue/global/aboutCache.css | 102 +++++++++++++++++++ EarlyBlue/global/aboutCacheEntry.css | 65 ++++++++++++ EarlyBlue/global/headsUpDisplay.css | 1 + EarlyBlue/global/media/videocontrols.css | 44 ++++----- EarlyBlue/global/popup.css | 8 +- EarlyBlue/help/helpFileLayout.css | 2 +- EarlyBlue/mozapps/extensions/extensions.css | 4 + LCARStrek/global/aboutCache.css | 103 ++++++++++++++++++++ LCARStrek/global/aboutCacheEntry.css | 65 ++++++++++++ LCARStrek/global/headsUpDisplay.css | 1 + LCARStrek/global/media/videocontrols.css | 34 +++---- LCARStrek/global/popup.css | 4 +- LCARStrek/help/helpFileLayout.css | 2 +- LCARStrek/mozapps/extensions/extensions.css | 4 + 14 files changed, 388 insertions(+), 51 deletions(-) create mode 100644 EarlyBlue/global/aboutCache.css create mode 100644 EarlyBlue/global/aboutCacheEntry.css create mode 100644 LCARStrek/global/aboutCache.css create mode 100644 LCARStrek/global/aboutCacheEntry.css diff --git a/EarlyBlue/global/aboutCache.css b/EarlyBlue/global/aboutCache.css new file mode 100644 index 00000000..4a750d2a --- /dev/null +++ b/EarlyBlue/global/aboutCache.css @@ -0,0 +1,102 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +h1 { + margin: 0; + border-bottom: 1px solid #666699; +} + +h2 { + margin-top: 2em; +} + +table { + table-layout: fixed; + width: 100%; + margin-bottom: 1em; + padding: 0.5em 0; + border: 1px solid #9999CC; +} + +#disk, +#memory, +#offline { + background-color: #CCD0DD; +} + +th { + width: 14em; + white-space: nowrap; + text-align: end; +} + +td { + word-wrap: break-word; +} + +#col-key { + width: 60%; +} + +#col-dataSize, +#col-fetchCount, +#col-lastModified, +#col-expires { + width: 13%; +} + +#entries > tbody > tr:nth-child(odd) { + background-color: #CCD0DD; +} + +#entries > tbody > tr:nth-child(even) { + background-color: #CCCCCC; +} + +#entries > tbody > tr > td { + padding: .5em 0; + text-align: center; +} + +#entries > thead > tr > th { + text-align: center; + white-space: normal; +} + +#entries > thead > tr > th:first-child, +#entries > tbody > tr > td:first-child { + text-align: start; +} diff --git a/EarlyBlue/global/aboutCacheEntry.css b/EarlyBlue/global/aboutCacheEntry.css new file mode 100644 index 00000000..645f8ffb --- /dev/null +++ b/EarlyBlue/global/aboutCacheEntry.css @@ -0,0 +1,65 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +body { + display: table; +} + +h1 { + margin: 0; + border-bottom: 1px solid #666699; +} + +table { + table-layout: fixed; + width: 100%; +} + +th { + width: 12em; + word-wrap: break-word; + vertical-align: top; + text-align: end; +} + +td { + display: block; + white-space: pre-wrap; +} + +#td-key { + word-wrap: break-word; +} diff --git a/EarlyBlue/global/headsUpDisplay.css b/EarlyBlue/global/headsUpDisplay.css index a57272c9..decfc730 100644 --- a/EarlyBlue/global/headsUpDisplay.css +++ b/EarlyBlue/global/headsUpDisplay.css @@ -57,6 +57,7 @@ .hud-output-node div { -moz-user-select: text; + white-space: pre-wrap; } .hud-output-node .hud-network { diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index f6d5495e..f820d421 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -80,7 +80,7 @@ padding-top: 0px; /* center vertically with scrubber bar */ color: rgba(204,208,221,0.75); font-size: 11px; - font-family: helvetica,arial,tahoma,sans-serif; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; } .backgroundBar { @@ -124,9 +124,9 @@ } .scrubber .scale-slider { - /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ - margin-top: -10px; - margin-bottom: 10px; + /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ + margin-top: -10px; + margin-bottom: 10px; } /* .scale-thumb is an element inside the implementation. */ @@ -137,14 +137,14 @@ } .timeThumb { - background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; - min-width: 45px; - min-height: 28px; - -moz-box-pack: center; + background: url("chrome://global/skin/media/scrubberThumb.png") no-repeat center; + min-width: 45px; + min-height: 28px; + -moz-box-pack: center; } .timeThumb[showhours="true"] { - background: url("chrome://global/skin/media/scrubberThumbWide.png") no-repeat center; + background: url("chrome://global/skin/media/scrubberThumbWide.png") no-repeat center; } /* @@ -154,29 +154,29 @@ */ .timeLabel { - color: rgba(0,0,0,0.75); - font-size: 10px; - font-family: helvetica,arial,tahoma,sans-serif; - text-shadow: rgba(102,102,153, 0.3) 0 1px; - padding-top: 2px; + color: rgba(0,0,0,0.75); + font-size: 10px; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + text-shadow: rgba(102,102,153, 0.3) 0 1px; + padding-top: 2px; } .statusOverlay { - -moz-box-align: center; - -moz-box-pack: center; - background-color: rgba(0,0,0,0.55); + -moz-box-align: center; + -moz-box-pack: center; + 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; + 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; + 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; + background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; } diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index 1661efb5..9636325b 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -35,16 +35,11 @@ * * ***** END LICENSE BLOCK ***** */ -/* ===== popup.css ====================================================== - == Styles used by the XUL popup element. - ======================================================================= */ - @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* ::::: menupopup ::::: */ menupopup, -popup, panel { border: 1px outset #CCD0DD; padding: 1px; @@ -78,7 +73,6 @@ menulist > menupopup, background-color: white; } -menupopup > menu > menupopup, -popup > menu > menupopup { +menupopup > menu > menupopup { margin-top: -2px; } diff --git a/EarlyBlue/help/helpFileLayout.css b/EarlyBlue/help/helpFileLayout.css index 9cf34358..9df1dd3e 100644 --- a/EarlyBlue/help/helpFileLayout.css +++ b/EarlyBlue/help/helpFileLayout.css @@ -80,7 +80,7 @@ h6 { font-size: 90%; border: 0; } h1, h2, h3, h4, h5, h6 { margin: 1em 0 0.2em; border-bottom: 1px solid #ccc; - font-family: arial, verdana, sans-serif; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; } li h1, li h2, li h3, li h4, li h5, li h6 { diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 8e2aabc2..2fe6bad4 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -165,6 +165,10 @@ -moz-margin-end: 6px; } +#header-searching { + list-style-image: url("chrome://global/skin/icons/loading.gif"); +} + .view-header { background: #9999CC; padding: 4px; diff --git a/LCARStrek/global/aboutCache.css b/LCARStrek/global/aboutCache.css new file mode 100644 index 00000000..1f5cdb4f --- /dev/null +++ b/LCARStrek/global/aboutCache.css @@ -0,0 +1,103 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +h1 { + margin: 0; + border-bottom: 1px solid #008484; +} + +h2 { + margin-top: 2em; +} + +table { + table-layout: fixed; + width: 100%; + margin-bottom: 1em; + padding: 0.5em 0; + -moz-border-radius: 10px; +} + +#disk, +#memory, +#offline { + background-color: #9C9CFF; + color: #000000; +} + +th { + width: 14em; + white-space: nowrap; + text-align: end; +} + +td { + word-wrap: break-word; +} + +#col-key { + width: 60%; +} + +#col-dataSize, +#col-fetchCount, +#col-lastModified, +#col-expires { + width: 13%; +} + +#entries > tbody > tr:nth-child(odd) { + background-color: rgba(255, 159, 0, .05); +} + +#entries > tbody > tr:nth-child(even) { + background-color: rgba(255, 159, 0, .1); +} + +#entries > tbody > tr > td { + padding: .5em 0; + text-align: center; +} + +#entries > thead > tr > th { + text-align: center; + white-space: normal; +} + +#entries > thead > tr > th:first-child, +#entries > tbody > tr > td:first-child { + text-align: start; +} diff --git a/LCARStrek/global/aboutCacheEntry.css b/LCARStrek/global/aboutCacheEntry.css new file mode 100644 index 00000000..740ed9fc --- /dev/null +++ b/LCARStrek/global/aboutCacheEntry.css @@ -0,0 +1,65 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +body { + display: table; +} + +h1 { + margin: 0; + border-bottom: 1px solid #008484; +} + +table { + table-layout: fixed; + width: 100%; +} + +th { + width: 12em; + word-wrap: break-word; + vertical-align: top; + text-align: end; +} + +td { + display: block; + white-space: pre-wrap; +} + +#td-key { + word-wrap: break-word; +} diff --git a/LCARStrek/global/headsUpDisplay.css b/LCARStrek/global/headsUpDisplay.css index 24b972df..db728178 100644 --- a/LCARStrek/global/headsUpDisplay.css +++ b/LCARStrek/global/headsUpDisplay.css @@ -57,6 +57,7 @@ .hud-output-node div { -moz-user-select: text; + white-space: pre-wrap; } .hud-output-node .hud-network { diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 1574d0be..4f11c9f5 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -103,7 +103,7 @@ padding-top: 0px; /* center vertically with scrubber bar */ color: rgba(0,0,0,0.75); font-size: 11px; - font-family: helvetica,arial,tahoma,sans-serif; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; } .backgroundBar { @@ -150,9 +150,9 @@ } .scrubber .scale-slider { - /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ - margin-top: -10px; - margin-bottom: 10px; + /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ + margin-top: -10px; + margin-bottom: 10px; } /* .scale-thumb is an element inside the implementation. */ @@ -180,29 +180,29 @@ */ .timeLabel { - color: rgba(0,0,0,0.75); - font-size: 10px; - font-family: helvetica,arial,tahoma,sans-serif; - text-shadow: rgba(255,259,0, 0.3) 0 1px; - padding-top: 2px; + color: rgba(0,0,0,0.75); + font-size: 10px; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + text-shadow: rgba(255,259,0, 0.3) 0 1px; + padding-top: 2px; } .statusOverlay { - -moz-box-align: center; - -moz-box-pack: center; - background-color: rgba(0,0,0,0.55); + -moz-box-align: center; + -moz-box-pack: center; + 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; + 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; + 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; + background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center; } diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css index cfd00c68..aa0a00cf 100644 --- a/LCARStrek/global/popup.css +++ b/LCARStrek/global/popup.css @@ -44,7 +44,6 @@ /* ::::: menupopup ::::: */ menupopup, -popup, panel { border: 1px solid #FF9F00; padding: 1px; @@ -79,7 +78,6 @@ menulist > menupopup, background-color: #000000; } -menupopup > menu > menupopup, -popup > menu > menupopup { +menupopup > menu > menupopup { margin-top: -2px; } diff --git a/LCARStrek/help/helpFileLayout.css b/LCARStrek/help/helpFileLayout.css index ecb7fe27..c1905c2a 100644 --- a/LCARStrek/help/helpFileLayout.css +++ b/LCARStrek/help/helpFileLayout.css @@ -80,7 +80,7 @@ h6 { font-size: 90%; border: 0; } h1, h2, h3, h4, h5, h6 { margin: 1em 0 0.2em; border-bottom: 1px solid #ccc; - font-family: arial, verdana, sans-serif; + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; } li h1, li h2, li h3, li h4, li h5, li h6 { diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 9d59e478..d8840b55 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -164,6 +164,10 @@ -moz-margin-end: 6px; } +#header-searching { + list-style-image: url("chrome://global/skin/icons/loading.gif"); +} + .view-header { background-color: #9C9CFF; color: #000000; -- 2.35.3