From dfa34f735488e744bba8ce56cafd00e04e1aecfb Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 20 Apr 2014 21:04:49 +0200 Subject: [PATCH] second part of syncing LCARStrek with Firefox 29 windows theme changes --- LCARStrek/browser/browser.css | 30 ++++++ LCARStrek/browser/devtools/dark-theme.css | 91 ++++++++-------- LCARStrek/browser/devtools/debugger.css | 92 ++++++++++++++--- LCARStrek/browser/devtools/ruleview.css | 6 ++ LCARStrek/browser/devtools/tracer-icon.png | Bin 0 -> 333 bytes LCARStrek/browser/devtools/tracer-icon@2x.png | Bin 0 -> 267 bytes LCARStrek/browser/devtools/widgets.css | 97 +++++++++++------- LCARStrek/browser/social/gear_clicked.png | Bin 0 -> 177 bytes LCARStrek/browser/social/gear_default.png | Bin 0 -> 177 bytes 9 files changed, 219 insertions(+), 97 deletions(-) create mode 100644 LCARStrek/browser/devtools/tracer-icon.png create mode 100644 LCARStrek/browser/devtools/tracer-icon@2x.png create mode 100644 LCARStrek/browser/social/gear_clicked.png create mode 100644 LCARStrek/browser/social/gear_default.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 848f5297..6f13b4ae 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -3724,6 +3724,36 @@ html|*#gcli-output-frame { /* === BEGIN chat.inc.css === */ +#social-sidebar-header { + padding: 3px; +} + +#social-sidebar-button { + -moz-appearance: none; + list-style-image: url("chrome://browser/skin/social/gear_default.png"); + min-width: 16px; + padding: 0; + margin: 2px; +} +#social-sidebar-button:hover, +#social-sidebar-button:hover:active { + list-style-image: url("chrome://browser/skin/social/gear_clicked.png"); +} +#social-sidebar-button > .toolbarbutton-menu-dropmarker { + display: none; +} + +#social-sidebar-button[loading="true"] { + list-style-image: url("chrome://global/skin/icons/loading.gif"); +} + +#social-sidebar-favico { + max-height: 16px; + max-width: 16px; + padding: 0; + margin: 2px; +} + .chat-status-icon { max-height: 16px; max-width: 16px; diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index d9bb9a32..61e2b705 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -11,6 +11,11 @@ color: #FF9F00; } +::-moz-selection { + background-color: #008484; + color: #FFCF00; +} + .theme-twisty { cursor: pointer; width: 14px; @@ -52,7 +57,7 @@ } .theme-bg-contrast, -.variable-or-property[changed] { /* contrast bg color to attract attention on a container */ +.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */ background: #402800; } @@ -92,7 +97,8 @@ .theme-fg-color1, .cm-s-mozilla .cm-number, .variable-or-property .token-number, -.variable-or-property[return] > .title > .name { /* original: green */ +.variable-or-property[return] > .title > .name, +.variable-or-property[scope] > .title > .name { /* original: green */ color: #008484; } @@ -102,8 +108,7 @@ .cm-s-mozilla .cm-def, .cm-s-mozilla .cm-property, .cm-s-mozilla .cm-qualifier, -.variables-view-variable > .title > .name, -.variable-or-property[scope] > .title > .name { /* original: blue */ +.variables-view-variable > .title > .name { /* original: blue */ color: #9C9CFF; } @@ -329,18 +334,18 @@ devtools-menulist:-moz-focusring, /*-moz-box-orient: horizontal;*/ } -.devtools-toolbarbutton:not([checked=true]):hover:active { +.devtools-toolbarbutton:not([checked]):hover:active { } .devtools-menulist[open=true], .devtools-toolbarbutton[open=true], -.devtools-toolbarbutton[checked=true] { +.devtools-toolbarbutton[checked] { } -.devtools-toolbarbutton[checked=true] { +.devtools-toolbarbutton[checked] { } -.devtools-toolbarbutton[checked=true]:hover:active { +.devtools-toolbarbutton[checked]:hover:active { } .devtools-option-toolbarbutton { @@ -382,48 +387,36 @@ devtools-menulist:-moz-focusring, .devtools-textinput, .devtools-searchinput { - -moz-appearance: none; -/* margin: 0 3px; - min-height: 22px; - border: 1px solid hsla(211,68%,6%,.6); - box-shadow: inset 0 1px 0 hsla(211,68%,6%,.05), 0 0 0 1px hsla(210,40%,83%,.1); +/* -moz-appearance: none; + margin: 0 3px; + border: 1px solid rgb(88, 94, 101); border-radius: 2px; - background-color: transparent; - background-image: linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35)); - padding: 3px;*/ - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - transition-timing-function: ease; -/* color: inherit; */ + background-color: rgba(24, 29, 32, 1); + padding: 4px 6px; + color: rgba(184, 200, 217, 1);*/ } .devtools-searchinput { - background-image: url("magnifying-glass.png")/*, linear-gradient(hsla(210,16%,76%,.15), hsla(210,16%,76%,.35))*/; - background-repeat: no-repeat; - background-position: 4px center, top left, top left; -/* padding-top: 0; - padding-bottom: 0;*/ - -moz-padding-start: 18px; +/* padding-top: 3px; + padding-bottom: 3px;*/ + -moz-padding-start: 22px; -moz-padding-end: 12px; + background-image: url("magnifying-glass.png"); + background-position: 8px center; + background-repeat: no-repeat; font-size: inherit; } .devtools-searchinput:-moz-locale-dir(rtl) { - background-position: calc(100% - 4px) center, top left, top left; + background-position: calc(100% - 8px) center; } .devtools-searchinput > .textbox-input-box > .textbox-search-icons { display: none; } -.devtools-searchinput > .textbox-input-box > .textbox-input::-moz-placeholder { -/* color: hsl(208,10%,66%);*/ -} - .devtools-no-search-result { -/* box-shadow: inset 0 0 0 1px hsla(0,68%,6%,.35); - border-color: hsl(10,70%,40%) hsl(10,75%,37%) hsl(10,80%,35%) !important;*/ - background-image: url("magnifying-glass.png"), linear-gradient(rgba(255,0,0,.15), rgba(255,0,0,.35)); + border-color: #FF0000 !important; } /* Close button */ @@ -501,22 +494,22 @@ devtools-menulist:-moz-focusring, .devtools-sidebar-tabs > tabs > tab:hover:active { } -.devtools-sidebar-tabs > tabs > tab[selected=true] + tab { +.devtools-sidebar-tabs > tabs > tab[selected] + tab { } -.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover { +.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { } -.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover:active { +.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active { } -.devtools-sidebar-tabs > tabs > tab[selected=true] { +.devtools-sidebar-tabs > tabs > tab[selected] { } -.devtools-sidebar-tabs > tabs > tab[selected=true]:hover { +.devtools-sidebar-tabs > tabs > tab[selected]:hover { } -.devtools-sidebar-tabs > tabs > tab[selected=true]:hover:active { +.devtools-sidebar-tabs > tabs > tab[selected]:hover:active { } /* Toolbox - moved from toolbox.css. @@ -693,7 +686,7 @@ devtools-menulist:-moz-focusring, } .devtools-tab:active > image, -.devtools-tab[selected=true] > image { +.devtools-tab[selected] > image { } .devtools-tab:hover, @@ -702,7 +695,7 @@ devtools-menulist:-moz-focusring, color: #000000; } -.devtools-tab[selected=true] { +.devtools-tab[selected] { background-color: #008484; color: #000000; } @@ -725,19 +718,19 @@ devtools-menulist:-moz-focusring, -moz-margin-end: 3px; } -.devtools-tab:not(.highlighted) > .highlighted-icon, -.devtools-tab[selected=true] > .highlighted-icon, -.devtools-tab:not([selected=true]).highlighted > .default-icon { +.devtools-tab:not([highlighted]) > .highlighted-icon, +.devtools-tab[selected] > .highlighted-icon, +.devtools-tab:not([selected])[highlighted] > .default-icon { visibility: collapse; } -.devtools-tab:not([selected=true]).highlighted { +.devtools-tab:not([selected])[highlighted] { color: #FFCF00; } -.devtools-tab:not(.highlighted) > .highlighted-icon, -.devtools-tab[selected=true] > .highlighted-icon, -.devtools-tab:not([selected=true]).highlighted > .default-icon { +.devtools-tab:not([highlighted]) > .highlighted-icon, +.devtools-tab[selected] > .highlighted-icon, +.devtools-tab:not([selected])[highlighted] > .default-icon { visibility: collapse; } diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index 1369b3a0..3514515d 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -8,16 +8,12 @@ window { /* Sources and breakpoints pane */ -#sources-pane { - min-width: 50px; -} - #sources-pane > tabs { -moz-border-end: 1px solid #9C9CFF; /* Match the sources list's dark margin. */ } -#sources-and-editor-splitter { - -moz-border-start-color: transparent; +#sources-pane[selectedIndex="0"] + #sources-and-editor-splitter { + border-color: transparent; } #sources-toolbar > .devtools-toolbarbutton, @@ -76,7 +72,8 @@ window { #black-boxed-message, #source-progress-container { background-color: #A09090; - /* Prevent the container deck from aquiring the height from this message. */ + /* Prevent the container deck from aquiring the size from this message. */ + min-width: 1px; min-height: 1px; color: #000000; } @@ -97,6 +94,82 @@ window { padding: .25em; } +/* Tracer */ + +#trace { + list-style-image: url("tracer-icon.png"); + -moz-image-region: rect(0px,16px,16px,0px); +} + +#trace:hover, +#trace[checked] { + -moz-image-region: rect(0px,32px,16px,16px); +} + +#start-tracing { + padding: 4px; + margin: 4px; +} + +#clear-tracer { + /* Make this button as narrow as the text inside it. */ + min-width: 1px; +} + +#tracer-message { + /* Prevent the container deck from aquiring the height from this message. */ + min-height: 1px; +} + +.trace-name { + -moz-padding-start: 4px !important; +} + +#tracer-traces > scrollbox { + overflow: scroll; + /* Hack to enable hardware acceleration */ + transform: translateZ(0); +} + +/* Tracer dark+light theme */ + +#tracer-message { + color: #FF9F00; /* Light foreground text */ +} + +.trace-item { + color: #FF9F00; /* Light foreground text */ +} + +.trace-item.selected-matching { + background-color: #004242; /* Select highlight blue at 40% alpha */ +} + +.selected > .trace-item { + background-color: #004242; /* Select highlight blue at 75% alpha */ +} + +.trace-call { + color: #9C9CFF; /* highlight blue */ +} + +.trace-return, +.trace-yield { + color: #008484; /* highlight green */ +} + +.trace-throw { + color: #FF0000; /* highlight red */ +} + +.trace-param { + color: #E7ADE7; /* Content text light */ +} + +.trace-syntax { + color: #A09090; /* highlight grey */ +} + /* ListWidget items */ .list-widget-item { @@ -228,11 +301,6 @@ window { /* Instruments pane (watch expressions, variables, event listeners...) */ -#instruments-pane > tabs > tab { -/* min-height: 25px !important; - padding: 0 !important;*/ -} - #instruments-pane .side-menu-widget-container, #instruments-pane .side-menu-widget-empty-notice-container { /* box-shadow: none !important; */ diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index 6e36558e..f999d6ef 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -22,6 +22,7 @@ padding: 1px 4px; margin-top: 4px; -moz-user-select: none; + word-wrap: break-word; } .ruleview-rule-source:hover { @@ -115,6 +116,7 @@ .ruleview-property { border-left: 2px solid transparent; + clear: right; } .ruleview-property > * { @@ -135,6 +137,10 @@ border-bottom-color: #008484; } +.ruleview-selector { + word-wrap: break-word; +} + .ruleview-selector-separator, .ruleview-selector-unmatched { color: #8050B0; } diff --git a/LCARStrek/browser/devtools/tracer-icon.png b/LCARStrek/browser/devtools/tracer-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e504877e7861f2029fbe2b99d268c7338c278351 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w$08!6$8z^F_Z^_nEl(H65Rc<;r#K2V8SuEqOQ!GX zX+F&P#7)MrEa#!yy#*nAd88j5dNhU0nVY-xn9l7zD*HXT>bXrWhAhf7Z&~qRuD=pf ziG!BZ=1mQJ9*JkPSL?BVYGqJ=t$e^YRc7w)47quK&T$s-g)C}l&XAfKxaMgin?@Ux z9^-=558kQ7A3fY5&l_!99M`pse@0`~vppRU_1^sMKNo&$wjR@( za$swS@X6}mM;31WaI5Lsx{ghZSCr=V)-3vYQ2pn!`R|l~as8O{Qa$YKTtZeb8+WSBKa0;qz$#M9T6{T_>mkgnv^ zA123uLe-uwjv*T7*Iqoxc|d`O^@2vl$2;!=tXh?y1bi=?BGVl#_T{)!u>R7WEOImc zC|r!+x=^3X`j^!LhDl8f5f52pT=s2KnjX!o(O}a0yHoPlrZ9mX!86|d?<6iR{_>dV zv4!w%CZhvSIvNaErT .variables-view-element-details:not(:empty) { - -moz-margin-start: 2px; - -moz-margin-end: 1px; -} +/* Generic variables traits */ -/* Generic traits applied to both variables and properties */ +.variables-view-variable:not(:last-child) { + border-bottom: 1px solid #A09090; +} -.variable-or-property { - transition: background 1s ease-in-out, color 1s ease-in-out; +.variables-view-variable > .title > .name { + font-weight: 600; } -.variable-or-property[changed] { - color: #000000; - transition-duration: .4s; +/* Generic variables *and* properties traits */ + +.variable-or-property:focus > .title > label { + color: inherit !important; } .variable-or-property > .title > .value { -moz-box-flex: 1; - -moz-padding-start: 6px; - -moz-padding-end: 4px; } -.variable-or-property[editable] > .title > .value { - cursor: text; +.variable-or-property > .title > .arrow { + -moz-margin-start: 3px; } .variable-or-property:not([untitled]) > .variables-view-element-details { - -moz-margin-start: 10px; + -moz-margin-start: 7px; } -/* Custom variables and properties traits */ +/* Traits applied when variables or properties are changed or overridden */ -.variables-view-variable { - -moz-margin-start: 1px; - -moz-margin-end: 1px; +.variable-or-property:not([overridden]) { + transition: background 1s ease-in-out, color 1s ease-in-out; } -.variables-view-variable:not(:last-child) { - border-bottom: 1px solid #A09090; +.variable-or-property:not([overridden])[changed] { + color: #000000; + transition-duration: .4s; } -.variables-view-variable > .title > .name { - font-weight: 600; +.variable-or-property[overridden] { + background: rgba(160,144,144,0.0.5); } -.variable-or-property:focus > .title > label { - color: inherit !important; +.variable-or-property[overridden] .title > label { + /* Cross out the title for this variable and all child properties. */ + font-style: italic; + text-decoration: line-through; + border-bottom: none !important; + color: #A09090; + opacity: 0.7; } +/* Traits applied when variables or properties are editable */ + +.variable-or-property[editable] > .title > .value { + cursor: text; +} + +.variable-or-property[overridden] .title > .value { + /* Disallow editing this variable and all child properties. */ + pointer-events: none; +} /* Custom configurable/enumerable/writable or frozen/sealed/extensible * variables and properties */ -.variable-or-property[non-enumerable]:not([self]):not([exception]):not([return]):not([scope]) > .title > .name { +.variable-or-property[non-enumerable]:not([self]):not([pseudo-item]) > .title > .name { opacity: 0.6; } -.variable-or-property[non-configurable] > .title > .name { +.variable-or-property[non-configurable]:not([pseudo-item]) > .title > .name { border-bottom: 1px dashed #9C9CFF; } -.variable-or-property[non-writable] > .title > .name { +.variable-or-property[non-writable]:not([pseudo-item]) > .title > .name { border-bottom: 1px dashed #FF0000; } -.variable-or-property[safe-getter] > .title > .name { +.variable-or-property[safe-getter]:not([pseudo-item]) > .title > .name { border-bottom: 1px dashed #A09090; } @@ -561,15 +581,20 @@ margin: 0 2px 0 2px; } -.variable-or-property[non-enumerable] > tooltip > label[value=enumerable], -.variable-or-property[non-configurable] > tooltip > label[value=configurable], -.variable-or-property[non-writable] > tooltip > label[value=writable] -.variable-or-property[non-extensible] > tooltip > label[value=extensible] { +.variable-or-property[non-enumerable] > tooltip > label.enumerable, +.variable-or-property[non-configurable] > tooltip > label.configurable, +.variable-or-property[non-writable] > tooltip > label.writable +.variable-or-property[non-extensible] > tooltip > label.extensible { color: #A09090; text-decoration: line-through; } -.variable-or-property[safe-getter] > tooltip > label[value=WebIDL] { +.variable-or-property[overridden] > tooltip > label.overridden { + -moz-padding-start: 4px; + -moz-border-start: 1px dotted #9C9CFF; +} + +.variable-or-property[safe-getter] > tooltip > label.WebIDL { -moz-padding-start: 4px; -moz-border-start: 1px dotted #9C9CFF; color: #008484; @@ -604,7 +629,7 @@ } .element-value-input { - -moz-margin-start: 4px !important; + -moz-margin-start: -2px !important; -moz-margin-end: 2px !important; } diff --git a/LCARStrek/browser/social/gear_clicked.png b/LCARStrek/browser/social/gear_clicked.png new file mode 100644 index 0000000000000000000000000000000000000000..1df36139d0734e177f104ada399c9d289a0f45ab GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uo3?xkcfy|{EuHHb3u_VYZ zn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI%?%M1%x24_vC9 z3KUZDba4#fxSpJlknq6rzyW@@ul5pIbp{b44FVGwpEw<9sx|`}WZV+CcRT Mp00i_>zopr0O%Dgng9R* literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/social/gear_default.png b/LCARStrek/browser/social/gear_default.png new file mode 100644 index 0000000000000000000000000000000000000000..c3b5055f7c8ba3b1dedf2eff6130d65b1ab988b6 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uo3?x