From eec397bed63746d5575bf0b2952a2bcce09d03c5 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 14 May 2012 00:00:16 +0200 Subject: [PATCH] sync LCARStrek to Firefox 13 winstripe changes, first part --- LCARStrek/browser/browser.css | 16 +- LCARStrek/browser/devtools/commandline.png | Bin 0 -> 177 bytes LCARStrek/browser/devtools/csshtmltree.css | 10 + LCARStrek/browser/devtools/debugger.css | 305 ++++++++++++++++++ .../browser/devtools/orion-container.css | 2 +- LCARStrek/browser/devtools/orion.css | 4 +- LCARStrek/browser/places/places.css | 4 + 7 files changed, 330 insertions(+), 11 deletions(-) create mode 100644 LCARStrek/browser/devtools/commandline.png create mode 100644 LCARStrek/browser/devtools/debugger.css diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a31c0af4..ec255acb 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -483,6 +483,10 @@ menuitem.bookmark-item { -moz-image-region: auto; } +.bookmark-item[container][livemark] .bookmark-item[visited] { + /* nothing yet */ +} + .bookmark-item[container][query] { list-style-image: url("chrome://communicator/skin/bookmarks/query.png"); -moz-image-region: auto; @@ -2528,21 +2532,17 @@ highlighter-veil-transparentbox { /* Highlighter - Node Infobar - text */ -#highlighter-nodeinfobar-tagname { +html|*#highlighter-nodeinfobar-tagname { color: #FFCF00; } -#highlighter-nodeinfobar-id { +html|*#highlighter-nodeinfobar-id { color: #9C9CFF; } -.highlighter-nodeinfobar-class { - color: #FF9F00; -} - /* Highlighter - Node Infobar - box & arrow */ - -#highlighter-nodeinfobar { +.highlighter-nodeinfobar { + color: #FF9F00; border: 1px solid rgba(156, 156, 255, .5); border-radius: 3px; padding: 8px 16px; diff --git a/LCARStrek/browser/devtools/commandline.png b/LCARStrek/browser/devtools/commandline.png new file mode 100644 index 0000000000000000000000000000000000000000..6fe06c17881839bc9a9b4d176f29db863c7fbf94 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)P$P6TpOk45*NHG=%xjQkeJ16rJ$YBfc331)F zV{${lhO)?w2_Wf`AirP+hi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~ zc>21s-{RmCm1K>JoGK0!68Cg*4B@z*TyY@aK*B+V!w1-ph&g;?W{{I$4wr1~QwAzw N@O1TaS?83{1OO}0E1UoT literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/devtools/csshtmltree.css b/LCARStrek/browser/devtools/csshtmltree.css index 37b35146..c530cd1e 100644 --- a/LCARStrek/browser/devtools/csshtmltree.css +++ b/LCARStrek/browser/devtools/csshtmltree.css @@ -66,6 +66,9 @@ .helplink:visited { text-decoration: none; } +link:hover { + text-decoration: underline; +} .helplink { display: block; @@ -85,6 +88,7 @@ .rulelink { color: -moz-dialogtext; padding: 0; + cursor: pointer; } .expander { @@ -200,7 +204,13 @@ .ruleview-rule-source { background-color: #000000; + color: #9C9CFF; padding: 2px 5px; + cursor: pointer; +} + +.ruleview-rule-source:hover { + text-decoration: underline; } .ruleview-code { diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css new file mode 100644 index 00000000..6f2ed475 --- /dev/null +++ b/LCARStrek/browser/devtools/debugger.css @@ -0,0 +1,305 @@ +/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ft=javascript ts=2 et sw=2 tw=80: */ +/* ***** 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 + * Mozilla Foundation + * Portions created by the Initial Developer are Copyright (C) 2011 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Dave Camp + * Victor Porof + * Panos Astithas + * + * 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 ***** */ + +window { + padding: 0; +} + +#body { + /* background: #000000; */ +} + +div, +span, +a { + font: inherit; +} + +/** + * Debugger toolbar + */ + +#dbg-toolbar { + /*padding: 2px;*/ +} + +#dbg-toolbar > button { + text-align: center; +} + +.devtools-closebutton { + list-style-image: url("chrome://navigator/skin/icons/win-close.gif"); +} + +.devtools-closebutton:hover { + list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif"); +} + +/** + * Debugger content + */ + +#dbg-content { + /* padding: 6px; */ +} + +#dbg-content > * > .vbox { + background-color: #000000; + border: 1px solid #9C9CFF; +} + +#dbg-content > * > .title { + /* text-shadow: 0 1px #fff; */ +} + +.devtools-side-splitter { + border: none; +} + +/** + * Debugger statusbar + */ + +#dbg-statusbar { +/* font: -moz-list; */ + padding: 2px; + -moz-padding-start: 5px; +} + +/** + * Lists and headers + */ + +.list-item { + padding: 2px; +/* font: -moz-list; */ +} + +.list-item.selected { + background: #008484; + color: #FFCF00; +} + +.list-item.empty { + color: #8050B0; +} + +/** + * Stack frames + */ + +#stackframes { + /* background-color: white; */ +} + +.dbg-stackframe { + -moz-padding-start: 4px; + -moz-padding-end: 4px; +} + +.dbg-stackframe-name { + font-weight: 600; +} + +/** + * Properties elements + */ + +#variables { +/* background-color: white; */ +} + +/** + * Generic element details container + */ + +.details { + -moz-margin-start: 10px; +} + +/** + * Scope element + */ + +.scope > .title { + margin-top: 1px; + -moz-padding-start: 2px; + background: #E7ADE7; + border-radius: 5px; + color: #000000; +} + +.scope > .title > .name { + padding-top: 2px; + padding-bottom: 2px; +} + +.scope > .details { + -moz-margin-start: 2px; + -moz-margin-end: 2px; +} + +/** + * Variable element + */ + +.variable { + -moz-margin-start: 1px; + -moz-margin-end: 1px; + border-bottom: 1px dotted #008484; +} + +.variable > .title > .name { + padding-top: 2px; + padding-bottom: 2px; + color: #FF9F00; + font-weight: 600; +} + +/** + * Property element + */ + +.property > .title > .key { + padding-top: 2px; + padding-bottom: 2px; + color: #E7ADE7; +} + +.property > .title > .value { + padding-top: 2px; + padding-bottom: 2px; +} + +/** + * Property colors + */ + +.token-undefined { + -moz-padding-start: 6px; + color: #8050B0; +} + +.token-null { + -moz-padding-start: 6px; + color: #008484; +} + +.token-boolean { + -moz-padding-start: 6px; + color: #FFCF00; +} + +.token-number { + -moz-padding-start: 6px; + color: #E7ADE7; +} + +.token-string { + -moz-padding-start: 6px; + color: #9C9CFF; +} + +.token-other { + -moz-padding-start: 6px; + color: #FF9F00; +} + +/** + * Expand/collapse arrow + */ + +.arrow { + width: 9px; + height: 9px; + -moz-margin-start: 5px; + -moz-margin-end: 5px; + background: url("chrome://global/skin/tree/twisty-closed.gif") center center no-repeat; +} + +.arrow[open] { + background-image: url("chrome://global/skin/tree/twisty-open.gif"); +} + +.scope > .title > .arrow { + background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif"); +} + +.scope > .title > .arrow[open] { + background-image: url("chrome://global/skin/tree/twisty-open-selected.gif"); +} + +/** + * Animations + */ + +.details[open] { + -moz-animation-duration: 0.25s; + -moz-animation-name: showblock; +} + +@-moz-keyframes showblock { + from { + opacity: 0; + -moz-transform-origin: top; + -moz-transform: scaleY(0); + } + + to { + opacity: 1; + -moz-transform-origin: top; + -moz-transform: scaleY(1); + } +} + +/** + * Display helpers + */ + +.unselectable { + padding-top: 2px; + padding-bottom: 2px; +} + +.info { + padding-top: 2px; + padding-bottom: 2px; +} diff --git a/LCARStrek/browser/devtools/orion-container.css b/LCARStrek/browser/devtools/orion-container.css index e29c298e..bb0efc9d 100644 --- a/LCARStrek/browser/devtools/orion-container.css +++ b/LCARStrek/browser/devtools/orion-container.css @@ -4,7 +4,7 @@ .viewTooltip { display: none; /* TODO: add tooltips support, see bug 721752 */ - font-family: monospace; + font-family: "Liberation Mono", Consolas, "Courier New", monospace; font-size: 13px; background-color: #9C9CFF; color: #000000; diff --git a/LCARStrek/browser/devtools/orion.css b/LCARStrek/browser/devtools/orion.css index 6c0a5538..0a166c12 100644 --- a/LCARStrek/browser/devtools/orion.css +++ b/LCARStrek/browser/devtools/orion.css @@ -3,8 +3,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ .viewContainer { - background: #cddae5; /* This will be seen as the continuation of the ruler */ - font-family: monospace; + background: #000000; /* This will be seen as the continuation of the ruler */ + font-family: "Liberation Mono", Consolas, "Courier New", monospace; font-size: inherit; /* inherit browser's default monospace font size */ } diff --git a/LCARStrek/browser/places/places.css b/LCARStrek/browser/places/places.css index 1d207e67..0ffdacc2 100644 --- a/LCARStrek/browser/places/places.css +++ b/LCARStrek/browser/places/places.css @@ -30,6 +30,10 @@ treechildren::-moz-tree-image(title, livemarkItem) { list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png"); } +treechildren::-moz-tree-image(title, livemarkItem, visited) { + /* nothing yet */ +} + treechildren::-moz-tree-image(title, separator) { list-style-image: none; width: 0; -- 2.43.0