From: Robert Kaiser Date: Mon, 8 Sep 2014 15:06:52 +0000 (+0200) Subject: third part of syncing LCARStrek with Firefox 32 windows theme changes X-Git-Tag: LCARStrek-2.29~5 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=3d64e0cebebe213f541634b9a0b2c6e7ba84fcfb;p=themes.git third part of syncing LCARStrek with Firefox 32 windows theme changes --- diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index f0055864..dbec1f60 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -113,13 +113,12 @@ menubar { #navigator-toolbox > toolbar:not(:-moz-lwtheme) { } +#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) { +} + @media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) { /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */ /* Indent also due to non-applicable aero rule in original Windows theme. */ - #toolbar-menubar { - background-color: transparent !important; - } - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme), #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) { /* like menubar */ @@ -137,10 +136,6 @@ menubar { /*color: inherit;*/ } - #TabsToolbar:-moz-lwtheme { - /*background: linear-gradient(to top, @toolbarShadowColor@ 2px, transparent 2px);*/ - } - #main-window[tabsintitlebar] #titlebar:-moz-lwtheme { visibility: hidden; } @@ -2454,13 +2449,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { border-bottom: 1px solid #008484; } -#main-window:not([customizing]) #TabsToolbar:not(:-moz-lwtheme) { -} - -#main-window[tabsintitlebar] #TabsToolbar { - background-color: transparent; -} - /* === BEGIN tabs.inc.css === */ .tabbrowser-tab, @@ -2519,7 +2507,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } -.tab-throbber { +.tab-throbber[busy] { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png"); } @@ -3050,7 +3038,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled .notification-anchor-icon:-moz-focusring { outline: 1px dotted #008484; -/* outline-offset: -3px; */ } .default-notification-icon, @@ -5055,3 +5042,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { } /* === END contextmenu.inc.css === */ + +#context-navigation { +} + +#context-sep-navigation { +/* margin-top: -4px; */ +} diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 199a6a74..47670532 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -15,13 +15,26 @@ width: 64px; height: 64px; position: absolute; - animation: moveX 3.05s linear 0s infinite alternate, - moveY 3.4s linear 0s infinite alternate; + transition: transform 1s ease-out; + animation: whimsyMoveX 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate; +} + +#PanelUI-popup #PanelUI-contents:active:empty::before { + animation: whimsyMoveX 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate, + whimsyRotate 1s linear 0s infinite normal; } #PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):empty::before { - animation: moveXRTL 3.05s linear 0s infinite alternate, - moveY 3.4s linear 0s infinite alternate; + animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate; +} + +#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):active:empty::before { + animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate, + whimsyMoveY 3.4s linear 0s infinite alternate, + whimsyRotate 1s linear 0s infinite normal; } #PanelUI-popup #PanelUI-contents:empty:hover::before { @@ -38,19 +51,25 @@ } } -@keyframes moveX { +@keyframes whimsyMoveX { /* These values are adjusted for the padding on the panel. */ from { margin-left: -9px; } to { margin-left: calc(100% - 55px); } } -@keyframes moveXRTL { + +@keyframes whimsyMoveXRTL { /* These values are adjusted for the padding on the panel. */ from { margin-right: -9px; } to { margin-right: calc(100% - 55px); } } -@keyframes moveY { + +@keyframes whimsyMoveY { /* These values are adjusted for the padding and height of the panel. */ from { margin-top: -.5em; } to { margin-top: calc(64px - .5em); } } +@keyframes whimsyRotate { + to { transform: perspective(5000px) rotateY(360deg); } +} + #customization-panelHolder { border-radius: 4px; } diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index 6c9875b5..6c9eafc9 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -213,14 +213,6 @@ notification { margin-bottom: -4px; } -/* Tooltip: Font Family Previewer Text */ -.devtools-tooltip-font-previewer-text { - max-width: 400px; - line-height: 1.5; - font-size: 150%; - text-align: center; -} - /* Tooltip: Alert Icon */ .devtools-tooltip-alert-icon { diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index a34a8b17..2b07d1ba 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -100,6 +100,15 @@ background-color: #9C9CFF; } +.cm-s-mozilla .cm-unused-line { + text-decoration: line-through; + -moz-text-decoration-color: #8050B0; +} + +.cm-s-mozilla .cm-executed-line { + background-color: #404000; +} + .theme-fg-color3, .cm-s-mozilla .cm-builtin, .cm-s-mozilla .cm-tag, @@ -343,10 +352,6 @@ div.CodeMirror span.eval-text { border-bottom: 1px solid #A09090; } -.theme-tooltip-panel .devtools-tooltip-font-previewer-text { - color: FF9F00; -} - .theme-tooltip-panel .devtools-tooltip-simple-text:last-child { border-bottom: 0; } @@ -622,10 +627,6 @@ devtools-menulist:-moz-focusring, * Rules that apply to the global toolbox like command buttons, * devtools tabs, docking buttons, etc. */ -#toolbox-controls { - margin: 0 2px; -} - #toolbox-controls > toolbarbutton, #toolbox-dock-buttons > toolbarbutton { min-width: 16px; @@ -667,7 +668,11 @@ devtools-menulist:-moz-focusring, } #toolbox-controls-separator { - -moz-margin-start: 4px; + width: 2px; +} + +#toolbox-controls-separator[invisible] { + visibility: hidden; } /* Command buttons */ @@ -786,12 +791,6 @@ devtools-menulist:-moz-focusring, border-radius: 8px 8px 0 0; } -.devtools-tab:first-child { -} - -.devtools-tab:last-child { -} - .devtools-tab > image { -moz-margin-end: 0px; /* -moz-margin-start: 4px; */ @@ -799,10 +798,6 @@ devtools-menulist:-moz-focusring, width: 16px; /* Prevents collapse during theme switching */ } -#toolbox-tab-options > image { -/* margin: 0 8px; */ -} - .devtools-tab:hover > image { } @@ -860,6 +855,20 @@ devtools-menulist:-moz-focusring, visibility: collapse; } +/* The options tab is special - it doesn't have the same parent + as the other tabs (toolbox-option-container vs toolbox-tabs) */ +#toolbox-option-container .devtools-tab:not([selected]) { +/* background-color: transparent;*/ +} +#toolbox-option-container .devtools-tab { +/* border-color: transparent; + border-width: 0; + -moz-padding-start: 1px;*/ +} +#toolbox-tab-options > image { +/* margin: 0 8px;*/ +} + .hidden-labels-box:not(.visible) > label, .hidden-labels-box.visible ~ .hidden-labels-box > label:last-child { display: none; diff --git a/LCARStrek/browser/devtools/debugger-blackBoxMessageEye.png b/LCARStrek/browser/devtools/debugger-blackBoxMessageEye.png deleted file mode 100644 index da3e35aa..00000000 Binary files a/LCARStrek/browser/devtools/debugger-blackBoxMessageEye.png and /dev/null differ diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index 86494e36..cae4aa7e 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -103,6 +103,24 @@ window { /* box-shadow: inset 1px 0 0 #222426; */ } +/* Debugger unblackbox button */ + +#black-boxed-message-button > .button-box > .button-icon { + width: 16px; + height: 16px; + background-image: url("debugger-blackbox.png"); + background-position: 0 0; + background-size: 32px 16px; + background-repeat: no-repeat; + -moz-margin-end: 5px; +} + +@media (min-resolution: 2dppx) { + #black-boxed-message-button > .button-box > .button-icon { + background-image: url("debugger-blackbox@2x.png"); + } +} + /* Black box message and source progress meter */ #black-boxed-message, diff --git a/LCARStrek/browser/devtools/filetype-dir-close.svg b/LCARStrek/browser/devtools/filetype-dir-close.svg new file mode 100644 index 00000000..ea8f0fcc --- /dev/null +++ b/LCARStrek/browser/devtools/filetype-dir-close.svg @@ -0,0 +1,4 @@ + + + + diff --git a/LCARStrek/browser/devtools/filetype-dir-open.svg b/LCARStrek/browser/devtools/filetype-dir-open.svg new file mode 100644 index 00000000..c1390f44 --- /dev/null +++ b/LCARStrek/browser/devtools/filetype-dir-open.svg @@ -0,0 +1,4 @@ + + + + diff --git a/LCARStrek/browser/devtools/filetype-globe.svg b/LCARStrek/browser/devtools/filetype-globe.svg new file mode 100644 index 00000000..809e0980 --- /dev/null +++ b/LCARStrek/browser/devtools/filetype-globe.svg @@ -0,0 +1,3 @@ + + + diff --git a/LCARStrek/browser/devtools/filetype-store.svg b/LCARStrek/browser/devtools/filetype-store.svg new file mode 100644 index 00000000..95be627c --- /dev/null +++ b/LCARStrek/browser/devtools/filetype-store.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/LCARStrek/browser/devtools/itemToggle.png b/LCARStrek/browser/devtools/itemToggle.png index 481eea67..29f10198 100644 Binary files a/LCARStrek/browser/devtools/itemToggle.png and b/LCARStrek/browser/devtools/itemToggle.png differ diff --git a/LCARStrek/browser/devtools/itemToggle@2x.png b/LCARStrek/browser/devtools/itemToggle@2x.png new file mode 100644 index 00000000..f00694da Binary files /dev/null and b/LCARStrek/browser/devtools/itemToggle@2x.png differ diff --git a/LCARStrek/browser/devtools/markup-view.css b/LCARStrek/browser/devtools/markup-view.css index c6b965f8..c1a36b2e 100644 --- a/LCARStrek/browser/devtools/markup-view.css +++ b/LCARStrek/browser/devtools/markup-view.css @@ -7,30 +7,78 @@ margin: 0; } -.tagname { - color: #FFCF00; +.more-nodes { + padding-left: 16px; } -.attrname { - color: #9C9CFF; +.styleinspector-propertyeditor { + border: 1px solid #9C9CFF; } -.attrvalue { - color: #E7ADE7; + +/* Selected nodes in the tree should have light selected text. + theme-selected doesn't work in this case since the text is a + sibling of the class, not a child. */ +.theme-selected ~ .editor, +.theme-selected ~ .editor .theme-fg-color1, +.theme-selected ~ .editor .theme-fg-color2, +.theme-selected ~ .editor .theme-fg-color3, +.theme-selected ~ .editor .theme-fg-color4, +.theme-selected ~ .editor .theme-fg-color5, +.theme-selected ~ .editor .theme-fg-color6, +.theme-selected ~ .editor .theme-fg-color7 { + color: #000000; /* Light foreground text */ } -.comment { - color: #8050B0; +/* In case a node isn't displayed in the page, we fade the syntax highlighting */ +.not-displayed .open, +.not-displayed .close { + opacity: .7; } -.selected { - background-color: #008484; +.tag-line { + padding-left: 2px; } -.more-nodes { - padding-left: 16px; +/* Preview */ + +#previewbar { + position: fixed; + top: 0; + right: 0; + width: 90px; + background: black; + border-left: 1px solid; + border-bottom: 1px solid; + overflow: hidden; } -.styleinspector-propertyeditor { - border: 1px solid #9C9CFF; +#previewbar { + background: #000000; /* Tab Toolbar */ + border-color: #9C9CFF; /* Splitters */ +} + +#preview { + position: absolute; + top: 0; + right: 5px; + width: 80px; + height: 100%; + background-image: -moz-element(#root); + background-repeat: no-repeat; +} + +#previewbar.hide, +#previewbar.disabled { + display: none; +} + +#viewbox { + position: absolute; + top: 0; + right: 5px; + width: 80px; + border: 1px dashed #9C9CFF; + background: #000000; + outline: 1px solid transparent; } diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index d4cd744d..00adc32c 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -340,6 +340,11 @@ box.requests-menu-status[code^="5"] { -moz-image-region: rect(0px,16px,16px,0px); } +#details-pane-toggle > .toolbarbutton-icon { + width: 16px; + height: 16px; +} + #details-pane-toggle[pane-collapsed] { list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png"); } @@ -349,6 +354,21 @@ box.requests-menu-status[code^="5"] { -moz-image-region: rect(0px,32px,16px,16px); } +@media (min-resolution: 2dppx) { + #details-pane-toggle { + list-style-image: url("chrome://browser/skin/devtools/debugger-collapse@2x.png"); + -moz-image-region: rect(0px,32px,32px,0px); + } + + #details-pane-toggle[pane-collapsed] { + list-style-image: url("chrome://browser/skin/devtools/debugger-expand@2x.png"); + } + + #details-pane-toggle:active { + -moz-image-region: rect(0px,64px,32px,32px); + } +} + /* Network request details tabpanels */ .tabpanel-content { diff --git a/LCARStrek/browser/devtools/projecteditor/file-icons-sheet@2x.png b/LCARStrek/browser/devtools/projecteditor/file-icons-sheet@2x.png new file mode 100644 index 00000000..a15a26a8 Binary files /dev/null and b/LCARStrek/browser/devtools/projecteditor/file-icons-sheet@2x.png differ diff --git a/LCARStrek/browser/devtools/projecteditor/projecteditor.css b/LCARStrek/browser/devtools/projecteditor/projecteditor.css new file mode 100644 index 00000000..467edd7d --- /dev/null +++ b/LCARStrek/browser/devtools/projecteditor/projecteditor.css @@ -0,0 +1,228 @@ +/* vim:set ts=2 sw=2 sts=2 et: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + :root { + color: #FF9F00; +} + +.plugin-hidden { + display: none; +} + +.arrow { + list-style-image: url("chrome://global/skin/tree/twisty-closed.gif"); + width: 20px; + height: 20px; +} + +.arrow[open] { + list-style-image: url("chrome://global/skin/tree/twisty-open.gif"); +} + +.arrow[invisible] { + visibility: hidden; +} + +#projecteditor-menubar { + display: none; +} + +#projecteditor-toolbar, +#projecteditor-toolbar-bottom { + display: none; /* For now don't show the status bars */ + min-height: 22px; + height: 22px; + background: #9C9CFF; +} + +#sources { + overflow: auto; +} + +.sources-tree { + overflow:auto; + overflow-x: hidden; + -moz-user-focus: normal; + + /* Allows this to expand inside of parent xul element, while + still supporting child flexbox elements, including ellipses. */ + -moz-box-flex: 1; + display: block; +} + +.sources-tree input { + margin: 2px; + border: 1px solid #A09090; +} + +#main-deck .sources-tree { + background: #000000; + min-width: 100px; +} + +.entry { + color: #FF9F00; + display: flex; + align-items: center; +} + +.entry .file-label { + display: flex; + flex: 1; + align-items: center; +} + +.entry .file-icon { + display: inline-block; + background: url("file-icons-sheet@2x.png"); + background-size: 140px 15px; + background-repeat: no-repeat; + width: 20px; + height: 15px; + background-position: -40px 0; + flex-shrink: 0; +} + +.entry .file-icon.icon-none { + display: none; +} + +.entry .icon-css { + background-position: 0 0; +} + +.entry .icon-js { + background-position: -20px 0; +} + +.entry .icon-html { + background-position: -40px 0; +} + +.entry .icon-file { + background-position: -60px 0; +} + +.entry .icon-folder { + background-position: -80px 0; +} + +.entry .icon-img { + background-position: -100px 0; +} + +.entry .icon-manifest { + background-position: -120px 0; +} + +.entry { + border: none; + box-shadow: none; + white-space: nowrap; + cursor: pointer; +} + +.entry:hover:not(.entry-group-title):not(.selected) { + background: #404000; +} + +.entry.selected { + background: #008484; + color: #000000; + outline: none; +} + +.entry-group-title { + background: #A09090; + color: #000000; + font-weight: bold; + font-size: 1.05em; + line-height: 35px; + padding: 0 10px; +} + +.sources-tree .entry-group-title .expander { + display: none; +} + +.entry .expander { + width: 16px; + padding: 0; +} + +.tree-collapsed .children { + display: none; +} + +/* Plugins */ + +#projecteditor-toolbar textbox { + margin: 0; +} + +.projecteditor-basic-display { + padding: 0 3px; +} + +/* App Manager */ +.project-name-label { + font-weight: bold; + padding-left: 10px; + overflow: hidden; + text-overflow: ellipsis; +} + +.project-flex { + flex: 1; +} + +.project-image { + max-height: 25px; + margin-left: -10px; +} + +.project-image, +.project-status, +.project-options { + flex-shrink: 0; +} + +.project-status { + width: 10px; + height: 10px; + border-radius: 50%; + border: solid 1px #9C9CFF; + margin-right: 10px; + color: #000000; + visibility: hidden; +} + +.project-status[status=valid] { + background: #008484; + visibility: visible; +} + +.project-status[status=warning] { + background: #FF9F00; + visibility: visible; +} + +.project-status[status=error] { + background: #FF0000; + visibility: visible; +} + +/* Status Bar */ +.projecteditor-file-label { + font-weight: bold; + padding-left: 29px; + padding-right: 10px; + flex: 1; +} + +/* Image View */ +.editor-image { + padding: 10px; +} diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index 6681dc48..6f545d35 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -8,12 +8,25 @@ .ruleview-rule-source { -moz-padding-start: 5px; - cursor: pointer; text-align: right; float: right; -moz-user-select: none; } +.ruleview-rule-source, +.ruleview-rule-source > label { + cursor: pointer; +} + +.ruleview-rule-source[unselectable], +.ruleview-rule-source[unselectable] > label { + cursor: default; +} + +.ruleview-rule-source:not([unselectable]):hover { + text-decoration: underline; +} + .ruleview-header { border-top-width: 1px; border-bottom-width: 1px; @@ -25,15 +38,38 @@ word-wrap: break-word; } -.ruleview-rule-source:hover { - text-decoration: underline; -} - .ruleview-rule, #noResults { padding: 2px 4px; } +/* User agent styles are not editable, display them differently */ +.theme-dark .ruleview-rule[uneditable=true] { + background: #A09090; /* Tab Toolbar */ +} + +.ruleview-rule[uneditable=true] :focus { + outline: none; +} + +.ruleview-rule[uneditable=true] .theme-link { + color: #336699; /* Blue - Grey */ +} + +.ruleview-rule[uneditable=true] .ruleview-enableproperty { + visibility: hidden; +} + +.ruleview-rule[uneditable=true] .ruleview-colorswatch { + cursor: default; +} + + +.ruleview-rule[uneditable=true] .ruleview-namecontainer > .ruleview-propertyname, +.ruleview-rule[uneditable=true] .ruleview-propertycontainer > .ruleview-propertyvalue { + border-bottom-color: transparent; +} + #noResults { font: message-box; color: #8050B0; @@ -104,6 +140,7 @@ } .ruleview-colorswatch { + cursor: pointer; border-radius: 50%; width: 1em; height: 1em; diff --git a/LCARStrek/browser/devtools/shadereditor.css b/LCARStrek/browser/devtools/shadereditor.css index 86dae070..07b474a6 100644 --- a/LCARStrek/browser/devtools/shadereditor.css +++ b/LCARStrek/browser/devtools/shadereditor.css @@ -64,9 +64,8 @@ window { } .side-menu-widget-item-checkbox .checkbox-check { - -moz-appearance: none; - background: none; background-image: url("itemToggle.png"); + background-color: transparent; background-repeat: no-repeat; background-clip: content-box; background-size: 32px 16px; @@ -76,6 +75,12 @@ window { border: 0; } +@media (min-resolution: 2dppx) { + .side-menu-widget-item-checkbox .checkbox-check { + background-image: url("itemToggle@2x.png"); + } +} + .side-menu-widget-item-checkbox[checked] .checkbox-check { background-position: 0 0; } diff --git a/LCARStrek/browser/devtools/styleeditor.css b/LCARStrek/browser/devtools/styleeditor.css index af6d5017..91905ff6 100644 --- a/LCARStrek/browser/devtools/styleeditor.css +++ b/LCARStrek/browser/devtools/styleeditor.css @@ -13,6 +13,50 @@ window:not([windowtype]) { background-color: #000000; } +.csscoverage-report { + background: #A09090; /* Toolbars */ +} + +.csscoverage-report-container { + height: 100vh; + padding: 10px; +} + +.csscoverage-report-content { + font-size: 13px; + margin: 0 auto; + max-width: 600px; + padding: 0 10px; +} + +.csscoverage-report h1, +.csscoverage-report h2, +.csscoverage-report h3 { + font-weight: bold; +} + +.csscoverage-report textarea { + width: 100%; + height: 100px; +} + +.csscoverage-report > .csscoverage-toolbar { + border: none; + margin: 0; + padding: 0; +} + +.csscoverage-report > .csscoverage-toolbarbutton { + min-width: 4em; + min-height: 100vh; + margin: 0; + padding: 0; + border-radius: 0; + border-top: none; + border-bottom: none; + -moz-border-start: none; +} + .stylesheet-title, .stylesheet-name { text-decoration: none; @@ -62,6 +106,27 @@ window:not([windowtype]) { padding: 0 10px; } +.stylesheet-sidebar { + width: 230px; +} + +.stylesheet-sidebar { + border-left: 1px solid #9C9CFF; +} + +.media-rule-label { + border-bottom: 1px solid #A09090; +} + +.media-rule-label { + padding: 4px; + cursor: pointer; +} + +.media-condition-unmatched { + color: #8050B0; +} + .stylesheet-enabled { padding: 8px 0; margin: 0 8px; @@ -69,10 +134,17 @@ window:not([windowtype]) { background-repeat: no-repeat; background-clip: content-box; background-position: 0 8px; + background-size: 48px 24px; width: 24px; height: 40px; } +@media (min-resolution: 2dppx) { + .stylesheet-enabled { + background-image: url("itemToggle@2x.png"); + } +} + .disabled > .stylesheet-enabled { background-position: -24px 8px; } @@ -121,6 +193,12 @@ h3 { padding: 0; } +@media (max-width: 700px) { + .stylesheet-sidebar { + width: 150px; + } +} + /* portrait mode */ @media (max-width: 550px) { .splitview-nav { @@ -144,4 +222,8 @@ h3 { .splitview-nav > li > hgroup.stylesheet-info { -moz-box-align: baseline; } + + .stylesheet-sidebar { + width: 180px; + } } diff --git a/LCARStrek/browser/devtools/webaudioeditor.css b/LCARStrek/browser/devtools/webaudioeditor.css index f4d70cc7..f6d13bf6 100644 --- a/LCARStrek/browser/devtools/webaudioeditor.css +++ b/LCARStrek/browser/devtools/webaudioeditor.css @@ -39,9 +39,7 @@ svg { .edgePath path { stroke-width: 1px; fill: none; -} -.edgePath path { stroke: #9C9CFF; /* Grey foreground text */ } diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 0b0a6e77..73e223eb 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -561,18 +561,6 @@ opacity: 0.6; } -.variable-or-property[non-configurable]:not([pseudo-item]) > .title > .name { - border-bottom: 1px dashed #9C9CFF; -} - -.variable-or-property[non-writable]:not([pseudo-item]) > .title > .name { - border-bottom: 1px dashed #FF0000; -} - -.variable-or-property[safe-getter]:not([pseudo-item]) > .title > .name { - border-bottom: 1px dashed #A09090; -} - .variable-or-property-non-writable-icon { background: url("chrome://browser/skin/devtools/vview-lock.png") no-repeat; background-size: cover; @@ -806,6 +794,153 @@ visibility: hidden; } +/* Canvas graphs */ + +.graph-widget-canvas { + width: 100%; + height: 100%; +} + +.graph-widget-canvas[input=hovering-background] { + cursor: text; +} + +.graph-widget-canvas[input=hovering-region] { + cursor: pointer; +} + +.graph-widget-canvas[input=hovering-selection-start-boundary], +.graph-widget-canvas[input=hovering-selection-end-boundary], +.graph-widget-canvas[input=adjusting-selection-boundary] { + cursor: col-resize; +} + +.graph-widget-canvas[input=hovering-selection-contents] { + cursor: grab; +} + +.graph-widget-canvas[input=dragging-selection-contents] { + cursor: grabbing; +} + +.graph-widget-canvas ~ * { + pointer-events: none; +} + +/* Line graph widget */ + +.line-graph-widget-container { + position: relative; +} + +.line-graph-widget-canvas { + background: #0088cc; +} + +.line-graph-widget-gutter { + position: absolute; + background: #000000; + width: 10px; + height: 100%; + top: 0; + left: 0; + border-right: 1px solid #9C9CFF; +} + +.line-graph-widget-gutter-line { + position: absolute; + width: 100%; + border-top: 1px solid; + transform: translateY(-1px); +} + +.line-graph-widget-gutter-line[type=maximum] { + border-color: #008484; +} + +.line-graph-widget-gutter-line[type=minimum] { + border-color: #FF0000; +} + +.line-graph-widget-gutter-line[type=average] { + border-color: #FF9F00; +} + +.line-graph-widget-tooltip { + position: absolute; + background: #404000; + border-radius: 2px; + line-height: 15px; + -moz-padding-start: 6px; + -moz-padding-end: 6px; + transform: translateY(-50%); + font-size: 80%; + z-index: 1; +} + +.line-graph-widget-tooltip::before { + content: ""; + position: absolute; + border-top: 3px solid transparent; + border-bottom: 3px solid transparent; + top: calc(50% - 3px); +} + +.line-graph-widget-tooltip[arrow=start]::before { + -moz-border-end: 3px solid #9C9CFF; + left: -3px; +} + +.line-graph-widget-tooltip[arrow=end]::before { + -moz-border-start: 3px solid #9C9CFF; + right: -3px; +} + +.line-graph-widget-tooltip[type=maximum] { + left: calc(10px + 6px); +} + +.line-graph-widget-tooltip[type=minimum] { + left: calc(10px + 6px); +} + +.line-graph-widget-tooltip[type=average] { + right: 6px; +} + +.line-graph-widget-tooltip > [text=info] { + color: #A09090; +} + +.line-graph-widget-tooltip > [text=value] { + -moz-margin-start: 3px; +} + +.line-graph-widget-tooltip > [text=metric] { + -moz-margin-start: 1px; + color: #9C9CFF; +} + +.line-graph-widget-tooltip > [text=value], +.line-graph-widget-tooltip > [text=metric] { +/* text-shadow: 1px 0px rgba(255,255,255,0.6), + -1px 0px rgba(255,255,255,0.6), + 0px -1px rgba(255,255,255,0.6), + 0px 1px rgba(255,255,255,0.6);*/ +} + +.line-graph-widget-tooltip[type=maximum] > [text=value] { + color: #008484; +} + +.line-graph-widget-tooltip[type=minimum] > [text=value] { + color: #FF0000; +} + +.line-graph-widget-tooltip[type=average] > [text=value] { + color: #FF9F00; +} + /* Charts */ .generic-chart-container { @@ -918,6 +1053,334 @@ color: #A09090; /* Light foreground text */ } +/* Table Widget */ + +/* Table body */ + +.table-widget-body > .devtools-side-splitter { + border: none; +} + +.table-widget-body { + overflow: auto; +} + +.table-widget-body { + background: #000000; /* Background-Sidebar */ +} + +.table-widget-body:-moz-locale-dir(ltr) { +/* box-shadow: inset -1px 0 0 @smw_marginDark@;*/ +} + +.table-widget-body:-moz-locale-dir(rtl) { +/* box-shadow: inset 1px 0 0 @smw_marginDark@;*/ +} + +.table-widget-body:-moz-locale-dir(ltr) { +/* box-shadow: inset -1px 0 0 @smw_marginLight@;*/ +} + +.table-widget-body:-moz-locale-dir(rtl) { +/* box-shadow: inset 1px 0 0 @smw_marginLight@;*/ +} + +/* Column Headers */ + +.table-widget-column-header, +.table-widget-cell { + -moz-border-end: 1px solid #A09090; +} + +/* Table widget column header colors are taken from netmonitor.inc.css to match + the look of both the tables. This needs to be updated along with netmonitor + header colors in bug 951714 */ + +.table-widget-column-header { + background: rgba(0,0,0,0); + position: sticky; + top: 0; + min-height: 32px; + width: 100%; + border: none; + padding: 8px 0 0 !important; + color: inherit; + text-align: center; + font-weight: inherit !important; + transition: background-color 0.1s ease-in-out; +} + +.table-widget-column-header:hover { + background: #FFCF00; +} + +.table-widget-column-header:hover:active { + background: #FF9F00; +} + +.table-widget-column-header:not(:active)[sorted] { + background: #008484; +} + +.table-widget-column-header:not(:active)[sorted=ascending] { + background-image: radial-gradient(farthest-side at center top, hsla(0,0%,0%,.7), hsla(0,0%,0%,0.3)); + background-size: 100% 1px; + background-repeat: no-repeat; +} + +.table-widget-column-header:not(:active)[sorted=descending] { + background-image: radial-gradient(farthest-side at center bottom, hsla(0,0%,0%,.7), hsla(0,0%,0%,0.3)); + background-size: 100% 1px; + background-repeat: no-repeat; + background-position: bottom; +} + +/* Cells */ + +.table-widget-cell { + width: 100%; + margin: -1px 0 !important; + padding: 3px 4px; + background-clip: padding-box; + min-width: 100px; + -moz-user-focus: normal; +} + +.table-widget-cell { + border-top: 1px solid #A09090; + border-bottom: 1px solid #A09090; + color: #FF9F00; /* Light foreground text */ +} + +.theme-dark:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), +.theme-light:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), +.table-widget-cell:not(.theme-selected)[odd] { + background: #404000; +} + +.table-widget-cell:last-of-type { +/* box-shadow: inset 0 -1px 0 @smw_itemDarkTopBorder@;*/ +} + +.table-widget-cell.flash-out { + animation: flash-out 0.5s ease-in; +} + +@keyframes flash-out { + to { + background: #795900; + } +} + +/* Empty text and initial text */ + +.table-widget-empty-text { + display: none; + text-align: center; + font-size: large; + margin-top: -20px !important; +} + +.table-widget-body:empty + .table-widget-empty-text:not([value=""]), +.table-widget-body[empty] + .table-widget-empty-text:not([value=""]) { + display: block; +} + +/* Tree Widget */ + +.tree-widget-container { + padding: 0; + margin: 0; + width: 100%; + height: 100%; + list-style: none; + overflow: hidden; + -moz-margin-end: 40px; +} + +.tree-widget-container:-moz-focusring, +.tree-widget-container *:-moz-focusring { + outline-style: none; +} + +.tree-widget-empty-text { + padding: 10px 20px; + font-size: medium; + background: transparent; +} + +/* Tree Item */ + +.tree-widget-container .tree-widget-item { + padding: 2px 0px 4px; + /* OSX has line-height 14px by default, which causes weird alignment issues + * because of 20px high icons. thus making line-height consistent with that of + * windows. + */ + line-height: 17px !important; + display: inline-block; + width: 100%; + word-break: keep-all; /* To prevent long urls like http://foo.com/bar from + breaking in multiple lines */ +} + +.tree-widget-container .tree-widget-children { + margin: 0; + padding: 0; + list-style: none; +} + +.tree-widget-item[level="1"] { + font-weight: 800; +} + +/* Twisties */ +.tree-widget-item:before { + content: ""; + width: 14px; + height: 14px; + float: left; + margin: 3px 2px -3px; + background-repeat: no-repeat; + background-image: url("chrome://browser/skin/devtools/controls.png"); + background-size: 56px 28px; + cursor: pointer; + background-position: -28px -14px; +} + +.tree-widget-item:-moz-locale-dir(rtl):before { + float: right; + transform: scaleX(-1); +} + +.theme-light .tree-widget-item:before { + background-position: 0 -14px; +} + +.tree-widget-item[empty]:before { + background: transparent; +} + +.tree-widget-item[expanded]:before { + background-position: -42px -14px; +} + +.theme-light .tree-widget-item[expanded]:before { + background-position: -14px -14px; +} + +.tree-widget-item + ul { + overflow: hidden; + animation: collapse-tree-item 0.2s; + max-height: 0; +} + +.tree-widget-item[expanded] + ul { + animation: expand-tree-item 0.3s; + max-height: unset; +} + +@keyframes collapse-tree-item { + from { + max-height: 300px; + } + to { + max-height: 0; + } +} + +@keyframes expand-tree-item { + from { + max-height: 0; + } + to { + max-height: 500px; + } +} + +@media (min-resolution: 2dppx) { + .tree-widget-item:before { + background-image: url("chrome://browser/skin/devtools/controls@2x.png"); + } +} + +/* Indentation of child items in the tree */ + +/* For level > 6 */ +.tree-widget-item[level] + ul > li > .tree-widget-item { + -moz-padding-start: 98px; +} + +/* First level */ +.tree-widget-item[level="1"] + ul > li > .tree-widget-item { + -moz-padding-start: 14px; +} + +/* Second level */ +.tree-widget-item[level="2"] + ul > li > .tree-widget-item { + -moz-padding-start: 28px; +} + +/* Third level */ +.tree-widget-item[level="3"] + ul > li > .tree-widget-item { + -moz-padding-start: 42px; +} + +/* Fourth level */ +.tree-widget-item[level="4"] + ul > li > .tree-widget-item { + -moz-padding-start: 56px; +} + +/* Fifth level */ +.tree-widget-item[level="5"] + ul > li > .tree-widget-item { + -moz-padding-start: 70px; +} + +/* Sixth level */ +.tree-widget-item[level="6"] + ul > li > .tree-widget-item { + -moz-padding-start: 84px; +} + +/* Custom icons for certain tree items indicating the type of the item */ + +.tree-widget-item[type]:after { + content: ""; + float: left; + width: 16px; + height: 17px; + -moz-margin-end: 4px; + background-repeat: no-repeat; + background-size: 20px auto; + filter: url('filters.svg#invert'); + background-position: 0 0; + background-size: auto 20px; +} + +.tree-widget-item:-moz-locale-dir(rtl):after { + float: right; +} + +.theme-dark .tree-widget-item[type]:after { + filter: url('filters.svg#invert-white'); +} + +.tree-widget-item[type="dir"]:after { + background-image: url("chrome://browser/skin/devtools/filetype-dir-close.svg"); + background-position: 2px 0; + background-size: auto 16px; + width: 20px; +} + +.tree-widget-item[type="dir"][expanded]:not([empty]):after { + background-image: url("chrome://browser/skin/devtools/filetype-dir-open.svg"); +} + +.tree-widget-item[type="url"]:after { + background-image: url("chrome://browser/skin/devtools/filetype-globe.svg"); + background-size: auto 18px; + width: 18px; +} + /* === BEGIN manifest-editor.inc.css === */ /* Manifest Editor overrides */ diff --git a/LCARStrek/browser/feeds/subscribe.css b/LCARStrek/browser/feeds/subscribe.css index 4a9f66d3..e996cf97 100644 --- a/LCARStrek/browser/feeds/subscribe.css +++ b/LCARStrek/browser/feeds/subscribe.css @@ -159,3 +159,8 @@ a[href] img { vertical-align: middle; margin-left: 2px; } + +.handlersMenuList > .menulist-label-box > .menulist-icon { + max-width: 16px; + max-height: 16px; +} diff --git a/LCARStrek/browser/preferences/in-content/favicon.ico b/LCARStrek/browser/preferences/in-content/favicon.ico new file mode 100644 index 00000000..19fe85a4 Binary files /dev/null and b/LCARStrek/browser/preferences/in-content/favicon.ico differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 27718a4e..cccf7d30 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -34,7 +34,7 @@ caption { margin: 0; } -.caption-text { +caption > label { font-size: 1.3rem; font-weight: bold; line-height: 22px; @@ -270,7 +270,6 @@ radio { #categories { background-color: #A09090; -/* -moz-border-end: 1px solid #FF9F00; */ padding-top: 39px; margin: 0; border-radius: 1em 0 0 0; @@ -280,9 +279,10 @@ radio { background-color: #000000; color: #FFCF00; -moz-border-end-width: 0; - -moz-padding-start: 14px; + -moz-padding-start: 15px; -moz-padding-end: 21px; min-height: 40px; + transition: background-color 150ms; } .category:hover { @@ -486,12 +486,17 @@ filefield { /* Applications Pane Styles */ -#applications-content { +#applicationsContent { -moz-margin-start: 60px; - padding: 15px; + padding: 15px 0; +} + +#filter { + -moz-margin-start: 0; } #handlersView { + -moz-margin-start: 0; font-size: 1.25rem; line-height: 22px; border: none; /*1px solid #9C9CFF;*/ @@ -585,14 +590,7 @@ description > html|a { cursor: pointer; } -/* Content Pane */ - -#defaultFontSize { - min-width: 5.5em; -} - -/* Sync Pane */ - +#offlineAppsList, #syncEnginesList { /* -moz-appearance: none; color: #737980; @@ -602,8 +600,6 @@ description > html|a { background-color: #F1F1F1;*/ } -/* Advanced Pane */ - #advancedPrefs { padding-bottom: 0; /* no padding needed in inContent prefs */ } @@ -613,15 +609,6 @@ description > html|a { -moz-margin-start: 60px; } -#offlineAppsList { -/* -moz-appearance: none; - color: #737980; - padding: 2px; - border: 1px solid rgba(23,50,77,0.4); - border-radius: 5px; - background-color: #F1F1F1;*/ -} - #telemetryLearnMore, #FHRLearnMore, #crashReporterLearnMore {