From: Robert Kaiser Date: Sun, 4 Mar 2012 19:55:46 +0000 (+0100) Subject: sync both themes with Mozilla 11 toolkit winstripe changes X-Git-Tag: LCARStrek-2.8~5 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=f128e38f4b564fd22f46f810e104934d864d7caf;p=themes.git sync both themes with Mozilla 11 toolkit winstripe changes --- diff --git a/EarlyBlue/global/findBar.css b/EarlyBlue/global/findBar.css index f7e35de4..86552d66 100644 --- a/EarlyBlue/global/findBar.css +++ b/EarlyBlue/global/findBar.css @@ -60,7 +60,7 @@ findbar { } .find-status-icon[status="notfound"] { - list-style-image: url("chrome://global/skin/icons/notfound.png"); + list-style-image: url("chrome://global/skin/icons/information-16.png"); } .findbar-textbox[status="notfound"] { diff --git a/EarlyBlue/global/icons/notfound.png b/EarlyBlue/global/icons/notfound.png deleted file mode 100644 index 98efc96b..00000000 Binary files a/EarlyBlue/global/icons/notfound.png and /dev/null differ diff --git a/EarlyBlue/global/media/fullscreenButton.png b/EarlyBlue/global/media/fullscreenButton.png new file mode 100644 index 00000000..3ca939da Binary files /dev/null and b/EarlyBlue/global/media/fullscreenButton.png differ diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index 00faa807..c76db360 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -28,17 +28,33 @@ .playButton { background-image: url("chrome://global/skin/media/pauseButton.png"); } -.playButton[paused="true"] { +.playButton[paused] { background-image: url("chrome://global/skin/media/playButton.png"); } .muteButton { background-image: url("chrome://global/skin/media/muteButton.png"); } -.muteButton[muted="true"] { +.muteButton[muted] { background-image: url("chrome://global/skin/media/unmuteButton.png"); } +.fullscreenButton { + background-color: transparent; + list-style-image: url("chrome://global/skin/media/fullscreenButton.png"); + -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-appearance: none; + margin: 0; + padding: 0; + min-height: 28px; + min-width: 28px; + border: none; +} + +.fullscreenButton[fullscreened] { + -moz-image-region: rect(0px, 32px, 16px, 16px); +} + .volumeStack { width: 28px; height: 70px; @@ -238,3 +254,17 @@ html|table { .statusOverlay[fadeout] { opacity: 0; } + +/* Error description formatting */ +.errorLabel { + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 11px; + color: #CCD0DD; + text-shadow: + -1px -1px 0 #000, + 1px -1px 0 #000, + -1px 1px 0 #000, + 1px 1px 0 #000; + padding: 0 10px; + text-align: center; +} diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css index 3a96fe18..750f55d0 100644 --- a/EarlyBlue/global/tree.css +++ b/EarlyBlue/global/tree.css @@ -192,10 +192,13 @@ treechildren::-moz-tree-separator { /* ::::: drop feedback ::::: */ +treechildren::-moz-tree-row(dropOn) { + background-color: #336699; +} + tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn), tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn), treechildren::-moz-tree-cell-text(dropOn) { - background-color: #336699; color: #FFFFFF; } diff --git a/EarlyBlue/global/webConsole.css b/EarlyBlue/global/webConsole.css deleted file mode 100644 index f8955064..00000000 --- a/EarlyBlue/global/webConsole.css +++ /dev/null @@ -1,335 +0,0 @@ -/* ***** 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 DevTools code - * - * The Initial Developer of the Original Code is - * Mozilla Corporation - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * David Dahl - - * 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 ***** */ - -.hud-box { - border-bottom: 1px solid #CCD0DD; -} - -.hud-box.animated { - -moz-transition: height 100ms; -} - -.hud-outer-wrapper { - width: 100%; - height: 100%; -} - -.hud-console-wrapper { - width: 100%; - overflow: auto; -} - -/* General output styles */ - -.webconsole-timestamp { - color: #808080; - margin-top: 0; - margin-bottom: 0; -} - -.hud-msg-node { - list-style-image: url("chrome://global/skin/icons/webconsole.png"); - -moz-image-region: rect(0, 1px, 0, 0); -} - -.webconsole-msg-icon { - margin: 3px 4px; - width: 8px; - height: 8px; -} - -.hud-output-node div { - -moz-user-select: text; - white-space: pre-wrap; - -moz-user-focus: normal; -} - -.hud-clickable { - cursor: pointer; - text-decoration: underline; -} - -.webconsole-msg-body { - margin-top: 0; - margin-bottom: 3px; - -moz-margin-start: 3px; - -moz-margin-end: 6px; - white-space: pre-wrap; -} - -.webconsole-msg-body-piece { - margin: 0; -} - -.webconsole-msg-url { - margin: 0 6px; -} - -/* Repeated messages */ -.webconsole-msg-repeat { - margin: 2px 0; - padding-left: 4px; - padding-right: 4px; - color: #FFFFFF; - background-color: #FF0000; - border-radius: 40px; - /* font: message-box; */ - font-size: 10px; - font-weight: 600; -} - -/* TODO move this and other functional rules to content - bug 635359 */ -.webconsole-msg-repeat[value="1"] { - display: none; -} - -.webconsole-location { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - -moz-margin-end: 6px; - width: 10em; - text-align: end; -} - -.hud-msg-node[selected="true"] > .webconsole-timestamp, -.hud-msg-node[selected="true"] > .webconsole-location { - color: inherit; -} - -.hud-output-node, -.jsterm-input-node, -.jsterm-complete-node { - font: 12px "Liberation Mono", Consolas, "Courier New", monospace; -} - -.hud-output-node { - -moz-appearance: none; - border-bottom: 1px solid #666699; - border-top: 1px solid #666699; - margin: 0; -} - -.hud-filtered-by-type, -.hud-filtered-by-string { - display: none; -} - -.webconsole-clear-console-button > .toolbarbutton-icon { - display: none; -} - -.webconsole-filter-button > .toolbarbutton-menubutton-button { - -moz-box-orient: horizontal; - list-style-image: url("chrome://global/skin/icons/webconsole.png"); -} - -.webconsole-filter-button > .toolbarbutton-menubutton-button, -.webconsole-filter-button > .toolbarbutton-menubutton-button:hover:active { - -moz-padding-start: 6px; - -moz-padding-end: 3px; -} - -.webconsole-filter-button { - -moz-margin-start: 3px; - -moz-margin-end: 3px; -} - -/* Network styles */ -.webconsole-filter-button[category="net"] { - -moz-image-region: rect(0, 8px, 8px, 0); -} - -.webconsole-msg-network > .webconsole-msg-icon-container { - -moz-border-start: solid #000 6px; -} - -.webconsole-msg-network.webconsole-msg-error { - -moz-image-region: rect(0, 16px, 8px, 8px); -} - -/* CSS styles */ -.webconsole-filter-button[category="css"] { - -moz-image-region: rect(8px, 8px, 16px, 0); -} - -.webconsole-msg-cssparser > .webconsole-msg-icon-container { - -moz-border-start: solid #00b6f0 6px; -} - -.webconsole-msg-cssparser.webconsole-msg-error { - -moz-image-region: rect(8px, 16px, 16px, 8px); -} - -.webconsole-msg-cssparser.webconsole-msg-warn { - -moz-image-region: rect(8px, 24px, 16px, 16px); -} - -/* JS styles */ -.webconsole-filter-button[category="js"] { - -moz-image-region: rect(16px, 8px, 24px, 0); -} - -.webconsole-msg-exception > .webconsole-msg-icon-container { - -moz-border-start: solid #fb9500 6px; -} - -.webconsole-msg-exception.webconsole-msg-error { - -moz-image-region: rect(16px, 16px, 24px, 8px); -} - -.webconsole-msg-exception.webconsole-msg-warn { - -moz-image-region: rect(16px, 24px, 24px, 16px); -} - -/* Web Developer styles */ -.webconsole-filter-button[category="webdev"] { - -moz-image-region: rect(24px, 8px, 32px, 0); -} - -.webconsole-msg-console > .webconsole-msg-icon-container { - -moz-border-start: solid #cbcbcb 6px; -} - -.webconsole-msg-console.webconsole-msg-error, -.webconsole-msg-output.webconsole-msg-error { - -moz-image-region: rect(24px, 16px, 32px, 8px); -} - -.webconsole-msg-console.webconsole-msg-warn { - -moz-image-region: rect(24px, 24px, 32px, 16px); -} - -.webconsole-msg-console.webconsole-msg-info { - -moz-image-region: rect(24px, 32px, 32px, 24px); -} - -/* Input and output styles */ -.webconsole-msg-input > .webconsole-msg-icon-container, -.webconsole-msg-output > .webconsole-msg-icon-container { - border-left: solid #808080 6px; -} - -.webconsole-msg-input { - -moz-image-region: rect(24px, 40px, 32px, 32px); -} - -.webconsole-msg-output { - -moz-image-region: rect(24px, 48px, 32px, 40px); -} - -.webconsole-close-button { - border: none; - padding: 3px; - list-style-image: url("chrome://global/skin/icons/close.png"); - -moz-image-region: rect(0, 16px, 16px, 0); - -moz-appearance: none; -} - -.webconsole-close-button:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -.webconsole-close-button:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -/* JSTerm Styles */ - -.jsterm-wrapper-node { - font-family: "Liberation Mono", Consolas, "Courier New", monospace; - font-size: 1em; - background-color: #000; - border: 1px solid #333; - padding: 0.1em; - width: 100%; - height: 400px; -} - -.jsterm-output-node { - width: 100%; - height: 400px; - color: white; - background-color: black; - overflow: auto; - overflow-x: auto; - position: absolute; - -moz-box-direction: reverse; -} - -.jsterm-scroll-to-node { - height: 1px; width: 1px; position: relative; top: 92%; display: block; -} - -.jsterm-input-node, -.jsterm-complete-node { - border: none; - padding: 0 0 0 16px; -} - -.jsterm-input-node { - background: url("chrome://global/skin/icons/commandline.png") 4px 3px no-repeat; -} - -:-moz-any(.jsterm-input-node, - .jsterm-complete-node) > .textbox-input-box > .textbox-textarea { - overflow-x: hidden; -} - -.jsterm-complete-node > .textbox-input-box > .textbox-textarea { - color: #808080; -} - -.jsterm-output-line { - font-size: 1em; -} - -.hud-console-filter-toolbar { - padding: 1px 2px; - -moz-box-align: center; -} - -.web-console-panel { - -moz-appearance: none; - background-color: white; -} - -.web-console-panel > .hud-box { - height: 100%; - width: 100%; - background-color: white; -} diff --git a/EarlyBlue/global/webConsole_networkPanel.css b/EarlyBlue/global/webConsole_networkPanel.css deleted file mode 100644 index 5bc8a185..00000000 --- a/EarlyBlue/global/webConsole_networkPanel.css +++ /dev/null @@ -1,115 +0,0 @@ -/* ***** 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 DevTools code - * - * The Initial Developer of the Original Code is - * Mozilla Corporation - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Joe Walker - * Julian Viereck - * Mihai Șucan - * - * 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 { - font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; - font-size: 11px; - background: #CCD0DD; - color: #000000; -} - -#header { - padding: 5px; - overflow-x:auto; - display: block; -} - -h1 { - font-size: 13px; - line-height: 15px; - padding: 3px 10px; - vertical-align: bottom; - margin: 0px; -} - -h1 .info { - font-size: 11px; - line-height: 15px; - vertical-align: bottom; - float: right; - color: #666699; - padding-right: 3px; - display: block; -} - -.property-table { - padding: 2px 5px; - color: #666699; - width: 100%; - max-height: 330px; - overflow: auto; -} - -.property-table-header { - font-size: 11px; - font-weight: bold; - padding-right: 4px; - color: #000; - white-space: nowrap; - text-align: right; - vertical-align: top; - width: 10%; -} - -.property-table-value { - padding-right: 5px; - font-size: 11px; - word-wrap: break-word; - width: 90%; -} - -div.group { - margin-top: 10px; -} - -div.group, -#header { - background: #FFF; - border-color: #9999CC; - border-style: solid; - border-width: 1px; -} - -img#responseImageNode { - max-width: 100%; -} - -#responseImageNodeDiv { - padding: 5px; -} diff --git a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css b/EarlyBlue/mozapps/extensions/xpinstallConfirm.css similarity index 100% rename from EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css rename to EarlyBlue/mozapps/extensions/xpinstallConfirm.css diff --git a/EarlyBlue/mozapps/update/updates.css b/EarlyBlue/mozapps/update/updates.css index dce5c4b9..94ae5c33 100644 --- a/EarlyBlue/mozapps/update/updates.css +++ b/EarlyBlue/mozapps/update/updates.css @@ -34,7 +34,7 @@ wizardpage { } .remoteLoadingThrobber[state="error"] { - list-style-image: url("chrome://global/skin/icons/notfound.png"); + list-style-image: url("chrome://global/skin/icons/information-16.png"); } .wizard-buttons-separator { diff --git a/LCARStrek/global/webConsole.css b/LCARStrek/browser/devtools/webconsole.css similarity index 97% rename from LCARStrek/global/webConsole.css rename to LCARStrek/browser/devtools/webconsole.css index c0add3e2..2ef48dfc 100644 --- a/LCARStrek/global/webConsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -62,7 +62,7 @@ } .hud-msg-node { - list-style-image: url("chrome://global/skin/icons/webconsole.png"); + list-style-image: url("chrome://browser/skin/devtools/webconsole.png"); -moz-image-region: rect(0, 1px, 0, 0); } @@ -155,7 +155,7 @@ .webconsole-filter-button > .toolbarbutton-menubutton-button { -moz-box-orient: horizontal; - list-style-image: url("chrome://global/skin/icons/webconsole.png"); + list-style-image: url("chrome://browser/skin/devtools/webconsole.png"); } .webconsole-filter-button > .toolbarbutton-menubutton-button, @@ -217,7 +217,7 @@ } /* Web Developer styles */ -.webconsole-filter-button[category="webdev"] { +.webconsole-filter-button[category="logging"] { -moz-image-region: rect(24px, 8px, 32px, 0); } diff --git a/EarlyBlue/global/icons/webconsole.png b/LCARStrek/browser/devtools/webconsole.png similarity index 100% rename from EarlyBlue/global/icons/webconsole.png rename to LCARStrek/browser/devtools/webconsole.png diff --git a/LCARStrek/global/webConsole_networkPanel.css b/LCARStrek/browser/devtools/webconsole_networkpanel.css similarity index 100% rename from LCARStrek/global/webConsole_networkPanel.css rename to LCARStrek/browser/devtools/webconsole_networkpanel.css diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css index b31fbd81..f4459c0a 100644 --- a/LCARStrek/global/findBar.css +++ b/LCARStrek/global/findBar.css @@ -64,7 +64,7 @@ findbar { } .find-status-icon[status="notfound"] { - list-style-image: url("chrome://global/skin/icons/notfound.png"); + list-style-image: url("chrome://global/skin/icons/information-16.png"); } .findbar-textbox[status="notfound"] { diff --git a/LCARStrek/global/icons/notfound.png b/LCARStrek/global/icons/notfound.png deleted file mode 100644 index a8619786..00000000 Binary files a/LCARStrek/global/icons/notfound.png and /dev/null differ diff --git a/LCARStrek/global/icons/webconsole.png b/LCARStrek/global/icons/webconsole.png deleted file mode 100644 index 48fdc9ba..00000000 Binary files a/LCARStrek/global/icons/webconsole.png and /dev/null differ diff --git a/LCARStrek/global/media/fullscreenButton.png b/LCARStrek/global/media/fullscreenButton.png new file mode 100644 index 00000000..3b1330a2 Binary files /dev/null and b/LCARStrek/global/media/fullscreenButton.png differ diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 54e3a934..1c7d9fc4 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -38,10 +38,10 @@ .playButton:hover { background-image: url("chrome://global/skin/media/pauseButton-hover.png"); } -.playButton[paused="true"] { +.playButton[paused] { background-image: url("chrome://global/skin/media/playButton.png"); } -.playButton[paused="true"]:hover { +.playButton[paused]:hover { background-image: url("chrome://global/skin/media/playButton-hover.png"); } @@ -51,13 +51,39 @@ .muteButton:hover { background-image: url("chrome://global/skin/media/muteButton-hover.png"); } -.muteButton[muted="true"] { +.muteButton[muted] { background-image: url("chrome://global/skin/media/unmuteButton.png"); } -.muteButton[muted="true"]:hover { +.muteButton[muted]:hover { background-image: url("chrome://global/skin/media/unmuteButton-hover.png"); } +.fullscreenButton { + background-color: transparent; + list-style-image: url("chrome://global/skin/media/fullscreenButton.png"); + -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-appearance: none; + margin: 0; + padding: 0; + min-height: 28px; + min-width: 28px; + border: none; +} + +.fullscreenButton:hover { + background-color: rgba(255,207,0,0.75); + -moz-image-region: rect(16px, 16px, 32px, 0px); +} + +.fullscreenButton[fullscreened] { + -moz-image-region: rect(0px, 32px, 16px, 16px); +} + +.fullscreenButton[fullscreened]:hover { + background-color: rgba(255,207,0,0.75); + -moz-image-region: rect(16px, 32px, 32px, 16px); +} + .volumeStack { width: 28px; height: 70px; @@ -265,3 +291,17 @@ html|table { .statusOverlay[fadeout] { opacity: 0; } + +/* Error description formatting */ +.errorLabel { + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 11px; + color: #E7ADE7; + text-shadow: + -1px -1px 0 #000, + 1px -1px 0 #000, + -1px 1px 0 #000, + 1px 1px 0 #000; + padding: 0 10px; + text-align: center; +} diff --git a/LCARStrek/global/tree.css b/LCARStrek/global/tree.css index 1831ce70..a684975d 100644 --- a/LCARStrek/global/tree.css +++ b/LCARStrek/global/tree.css @@ -202,10 +202,13 @@ treechildren::-moz-tree-separator { /* ::::: drop feedback ::::: */ +treechildren::-moz-tree-row(dropOn) { + background-color: #008484; +} + tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn), tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn), treechildren::-moz-tree-cell-text(dropOn) { - background-color: #008484; color: #FFCF00; } diff --git a/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css b/LCARStrek/mozapps/extensions/xpinstallConfirm.css similarity index 100% rename from LCARStrek/mozapps/xpinstall/xpinstallConfirm.css rename to LCARStrek/mozapps/extensions/xpinstallConfirm.css diff --git a/LCARStrek/mozapps/update/updates.css b/LCARStrek/mozapps/update/updates.css index 02bff767..07c6656e 100644 --- a/LCARStrek/mozapps/update/updates.css +++ b/LCARStrek/mozapps/update/updates.css @@ -34,7 +34,7 @@ wizardpage { } .remoteLoadingThrobber[state="error"] { - list-style-image: url("chrome://global/skin/icons/notfound.png"); + list-style-image: url("chrome://global/skin/icons/information-16.png"); } .wizard-buttons-separator {