From c5772fdfc8610c3a9c9979d3821839895f8afdde Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 22 Apr 2012 14:20:12 +0200 Subject: [PATCH] sync LCARSTrek with Firefox 12 winstrip changes - newtab is incomplete, though --- LCARStrek/browser/browser.css | 35 ++++------ LCARStrek/browser/devtools/csshtmltree.css | 80 ++++++++++++---------- LCARStrek/browser/devtools/gcli.css | 10 ++- LCARStrek/browser/devtools/splitview.css | 1 - LCARStrek/browser/devtools/webconsole.css | 3 +- LCARStrek/browser/engineManager.css | 2 +- 6 files changed, 68 insertions(+), 63 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 736697b1..ac5a3a63 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -431,9 +431,7 @@ menubar { } #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - width: 16px; - height: 16px; - background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat; + background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center; } .bookmarks-toolbar-customize { @@ -1449,12 +1447,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon #page-proxy-favicon { width: 16px; height: 16px; -} - -#page-proxy-stack { - width: 24px; - height: 18px; - padding: 1px 4px; + /* margin: 1px 4px; */ } #page-proxy-favicon:not([src]) { @@ -2518,27 +2511,19 @@ highlighter-veil-transparentbox { -moz-margin-start: 2px; } -/* Highlighter - toolbar resizers */ - -.inspector-resizer { - -moz-appearance: none; - cursor: n-resize; +#devtools-sidebar-box { + background-color: #000000; } +/* Highlighter - toolbar resizer */ + #inspector-top-resizer { + -moz-appearance: none; + cursor: n-resize; background: none; height: 4px; } -#inspector-end-resizer { - width: 12px; - height: 8px; - border-width: 1px 1px 0; - border-style: solid; - border-color: #008484; - margin: 7px 7px 8px; -} - /* Highlighter - Node Infobar */ /* Highlighter - Node Infobar - text */ @@ -2625,6 +2610,10 @@ highlighter-veil-transparentbox { padding: 0 6px; } +#inspector-breadcrumbs > .scrollbutton-up, +#inspector-breadcrumbs > .scrollbutton-down { +} + .inspector-breadcrumbs-button { /*background-color: transparent;*/ border-width: 2px 13px !important; diff --git a/LCARStrek/browser/devtools/csshtmltree.css b/LCARStrek/browser/devtools/csshtmltree.css index 621d69e0..37b35146 100644 --- a/LCARStrek/browser/devtools/csshtmltree.css +++ b/LCARStrek/browser/devtools/csshtmltree.css @@ -23,6 +23,7 @@ * Mihai Șucan * Michael Ratcliffe * Dão Gottwald + * Rob Campbell * * 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 @@ -48,17 +49,9 @@ } .property-header { - padding: 4px; - -moz-padding-start: 0; - -moz-padding-end: 5px; -} - -.rule-unmatched { - cursor: pointer; - padding: 2px; - -moz-padding-start: 4px; - -moz-padding-end: 0; + padding: 5px 0; white-space: nowrap; + vertical-align: text-top; } /* Take away these two :visited rules to get a core dumper */ @@ -74,11 +67,6 @@ text-decoration: none; } -.helplink-container { - position: relative; - top: 2px; -} - .helplink { display: block; height: 14px; @@ -87,19 +75,16 @@ -moz-padding-start: 14px; background-image: url("chrome://browser/skin/devtools/goto-mdn.png"); -moz-margin-end: 2px; + cursor: pointer; } -.property-header:not(:hover) > .helplink-container { +.property-view:not(:hover) > .helplink-container { visibility: hidden; } -.unmatchedSelectorTable { - -moz-margin-start: 15px; -} - .rulelink { color: -moz-dialogtext; - -moz-margin-start: 12px; + padding: 0; } .expander { @@ -108,6 +93,8 @@ -moz-margin-start: 5px; -moz-margin-end: 5px; background: url("chrome://global/skin/tree/twisty-closed.png") center center no-repeat; + display: inline-block; + vertical-align: middle; } .expander[open] { @@ -122,22 +109,49 @@ visibility: hidden; } -.expandable > .match { +.expandable > .property-header > .match { visibility: visible; } -.only-unmatched { - -moz-margin-start: 0; -} - .property-name { font-size: 12px; color: #FF9F00; width: 220px; + display: inline-block; } .property-value { + padding: 0; font-size: 10px; color: #8050B0; + vertical-align: text-top; + width: 100%; +} + +.property-view-hidden, +.property-content-hidden { + display: none; +} + +.rule-link { + text-align: end; + -moz-padding-start: 10px; +} + +/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */ +.rule-text { + direction: ltr; + padding: 0; + -moz-padding-start: 20px; +} + +.bestmatch { + color: #FFCF00; +} +.matched { + text-decoration: line-through; +} +.parentmatch { + color: #E7ADE7; } #propertyContainer { @@ -145,6 +159,7 @@ -moz-box-orient: vertical; -moz-box-flex: 1; overflow-y: auto; + border-collapse: collapse; } .darkrow { @@ -160,7 +175,6 @@ .headerControls { color: #9C9CFF; background-color: #000000; - padding-top: 5px; } .onlyuserstyles { @@ -168,14 +182,6 @@ font-size: 11px; } -.searchfield { - -moz-margin-start: 10px; -} - -.styleinspector-legend { - -moz-margin-start: 12px; -} - #footer { border-top: 1px solid #9C9CFF; } @@ -201,6 +207,10 @@ padding: 2px 5px; } +.ruleview-ruleopen { + -moz-padding-end: 5px; +} + .ruleview-propertylist { list-style: none; padding: 0; diff --git a/LCARStrek/browser/devtools/gcli.css b/LCARStrek/browser/devtools/gcli.css index d88d8bca..629246e8 100644 --- a/LCARStrek/browser/devtools/gcli.css +++ b/LCARStrek/browser/devtools/gcli.css @@ -110,6 +110,7 @@ margin-bottom: 3px; -moz-margin-start: 3px; -moz-margin-end: 6px; + list-style-image: none; } /* Extract from display.css, we only want these 2 rules */ @@ -173,7 +174,6 @@ .gcli-argfetch { width: 100%; - box-sizing: border-box; -moz-box-sizing: border-box; } @@ -187,7 +187,6 @@ .gcli-af-params { padding: 0 10px; width: 100%; - box-sizing: border-box; -moz-box-sizing: border-box; } @@ -308,6 +307,13 @@ font-weight: bold; } +.gcli-in-scratchlink { + float: right; + font-size: 85%; + color: #9C9CFF; + padding-right: 10px; +} + /* From: $GCLI/lib/gcli/commands/help.css */ .gcli-help-name { diff --git a/LCARStrek/browser/devtools/splitview.css b/LCARStrek/browser/devtools/splitview.css index ddebd8b6..01ae5823 100644 --- a/LCARStrek/browser/devtools/splitview.css +++ b/LCARStrek/browser/devtools/splitview.css @@ -75,7 +75,6 @@ .placeholder { -moz-box-flex: 1; - -moz-box-back: center; text-align: center; } diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index 2ef48dfc..6d065376 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -59,6 +59,7 @@ color: #8050B0; margin-top: 0; margin-bottom: 0; + font: 12px "Liberation Mono", Consolas, "Courier New", monospace; } .hud-msg-node { @@ -89,6 +90,7 @@ -moz-margin-start: 3px; -moz-margin-end: 6px; white-space: pre-wrap; + font: 12px "Liberation Mono", Consolas, "Courier New", monospace; } .webconsole-msg-body-piece { @@ -131,7 +133,6 @@ color: inherit; } -.hud-output-node, .jsterm-input-node, .jsterm-complete-node { font: 12px "Liberation Mono", Consolas, "Courier New", monospace; diff --git a/LCARStrek/browser/engineManager.css b/LCARStrek/browser/engineManager.css index 8d4a783c..7bb1945d 100644 --- a/LCARStrek/browser/engineManager.css +++ b/LCARStrek/browser/engineManager.css @@ -43,5 +43,5 @@ } #engineList treechildren::-moz-tree-row { - height: 20px !important; + height: 20px; } -- 2.43.0