From 6568957a6c8bab01b38e271cec8661f148805538 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 6 Jan 2014 16:12:09 +0100 Subject: [PATCH] rest of sync for LCARStrek with browser windows/shared theme changes in Firefox 27 cycle --- LCARStrek/browser/browser.css | 1 + LCARStrek/browser/devtools/common.css | 16 ++++++ LCARStrek/browser/devtools/dark-theme.css | 54 ++++++++++++++------- LCARStrek/browser/devtools/debugger.css | 5 +- LCARStrek/browser/devtools/orion-error.png | Bin 0 -> 382 bytes LCARStrek/browser/devtools/widgets.css | 23 +++++---- 6 files changed, 71 insertions(+), 28 deletions(-) create mode 100644 LCARStrek/browser/devtools/orion-error.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 5cd0f333..f8543d8c 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -3522,6 +3522,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes { /* Highlighter - Node Infobar - buttons */ .highlighter-nodeinfobar-button { + border-width: 0; padding: 0; width: 26px; min-height: 26px; diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index ca81d073..52c1bbca 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -371,6 +371,22 @@ devtools-menulist:-moz-focusring, padding: 4px; } +.devtools-tooltip-simple-text { + background-color: #000000; + max-width: 400px; + margin: 0 -4px; /* Compensate for the .panel-arrowcontent padding. */ + padding: 8px 12px; + white-space: pre-wrap; +} + +.devtools-tooltip-simple-text:first-child { + margin-top: -4px; +} + +.devtools-tooltip-simple-text:last-child { + margin-bottom: -4px; +} + .devtools-tooltip-tiles { background-color: #A09090; background-image: linear-gradient(45deg, #9C9CFF 25%, transparent 25%, transparent 75%, #9C9CFF 75%, #9C9CFF), diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 529143a1..5a5e5900 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -61,10 +61,19 @@ color: #3333FF; } +/* + * FIXME: http://bugzil.la/575675 CSS links without :visited set cause assertion + * failures in debug builds. + */ +.theme-link:visited, +.cm-s-mozilla .cm-link:visited { /* original: blue */ + color: #3333FF; +} + .theme-comment, .cm-s-mozilla .cm-meta, .cm-s-mozilla .cm-hr, -.cm-s-mozilla .cm-string { /* original: grey */ +.cm-s-mozilla .cm-comment { /* original: grey */ color: #A09090; } @@ -79,48 +88,45 @@ } .theme-fg-color1, -.cm-s-mozilla .cm-variable-2, -.cm-s-mozilla .cm-quote, -.cm-s-mozilla .CodeMirror-matchingbracket { /* original: green */ +.cm-s-mozilla .cm-number { /* original: green */ color: #008484; } .theme-fg-color2, .cm-s-mozilla .cm-attribute, -.cm-s-mozilla .cm-builtin, .cm-s-mozilla .cm-variable, .cm-s-mozilla .cm-def, -.cm-s-mozilla .cm-variable-3, .cm-s-mozilla .cm-property, .cm-s-mozilla .cm-qualifier { /* original: blue */ color: #9C9CFF; } .theme-fg-color3, +.cm-s-mozilla .cm-builtin, .cm-s-mozilla .cm-tag, .cm-s-mozilla .cm-header { /* original: pink/lavender */ color: #E7ADE7; } -.theme-fg-color4, -.cm-s-mozilla .cm-comment { /* original: purple/violet */ +.theme-fg-color4 { /* original: purple/violet */ color: #C09070; } .theme-fg-color5, .cm-s-mozilla .cm-bracket, -.cm-s-mozilla .cm-atom, .cm-s-mozilla .cm-keyword { /* original: Yellow */ color: #FFCF00; } -.theme-fg-color6 { /* original: Orange */ +.theme-fg-color6, +.cm-s-mozilla .cm-string, +.cm-s-mozilla .cm-string-2 { /* original: Orange */ color: #FF9F00; } .theme-fg-color7, -.cm-s-mozilla .CodeMirror-nonmatchingbracket, -.cm-s-mozilla .cm-string-2, +.cm-s-mozilla .cm-atom, +.cm-s-mozilla .cm-quote, .cm-s-mozilla .cm-error { /* original: Red */ color: #FF0000; } @@ -146,9 +152,10 @@ } .CodeMirror pre, +.cm-s-mozilla .cm-variable-2, +.cm-s-mozilla .cm-variable-3, .cm-s-mozilla .cm-operator, -.cm-s-mozilla .cm-special, -.cm-s-mozilla .cm-number { /* theme-body color */ +.cm-s-mozilla .cm-special { /* theme-body color */ color: #FF9F00; } @@ -161,13 +168,26 @@ color: #FFCF00; } -.dcm-s-mozilla .CodeMirror-selected { /* selected text (unfocused) */ +.cm-s-mozilla .CodeMirror-selected { /* selected text (unfocused) */ background: #008484; color: #000000; } -.CodeMirror-activeline-background { /* selected color with alpha */ - background: rgba(0, 132, 132, .05); +.cm-s-mozilla .CodeMirror-activeline-background { /* selected color with alpha */ + background: rgba(0, 132, 132, .15); +} + +div.cm-s-mozilla span.CodeMirror-matchingbracket { /* highlight brackets */ + outline: solid 1px rgba(0, 132, 132, .25); + color: #FFCF00; +} + +.cm-s-mozilla .CodeMirror-linenumber { /* line number text */ + color: #A09090; +} + +.cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */ + border-right-color: #9C9CFF; } .cm-s-markup-view pre { diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index a1e2caa3..b44969bb 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -20,8 +20,11 @@ window { -moz-border-start-color: transparent; } +#sources-toolbar .devtools-toolbarbutton { + min-width: 32px; +} + #pretty-print { - min-width: 0; font-weight: bold; } diff --git a/LCARStrek/browser/devtools/orion-error.png b/LCARStrek/browser/devtools/orion-error.png new file mode 100644 index 0000000000000000000000000000000000000000..786fc7d0169c9dc70d5f4e7184e53c1a439e081f GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaP3?%1DUd;wlEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8U)v6XNU~pO`ANprURz1*o$r9IylH~l{+|;}h2Ir#G#FEq$h4Rdj3