From 6f5a7408a1bd6d680d581fdf88469481da91aa72 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 27 Mar 2015 16:37:35 +0100 Subject: [PATCH] fifth part of syncing LCARStrek with Firefox 36 windows theme changes --- LCARStrek/browser/browser.css | 2 +- LCARStrek/browser/devtools/computedview.css | 4 + LCARStrek/browser/devtools/dark-theme.css | 3 +- LCARStrek/browser/devtools/performance.css | 170 ++++++++++++++++++++ LCARStrek/browser/devtools/timeline.css | 19 +-- LCARStrek/browser/devtools/widgets.css | 12 +- 6 files changed, 188 insertions(+), 22 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index af16fbdd..71579fb9 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -114,7 +114,7 @@ menubar { height: 1px; } -#navigator-toolbox > toolbar:not(:-moz-lwtheme) { +#navigator-toolbox > toolbar { } #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) { diff --git a/LCARStrek/browser/devtools/computedview.css b/LCARStrek/browser/devtools/computedview.css index 428c131a..eae29c39 100644 --- a/LCARStrek/browser/devtools/computedview.css +++ b/LCARStrek/browser/devtools/computedview.css @@ -27,6 +27,10 @@ body { flex: 1; } +.row-striped { + background: var(--theme-body-background); +} + .property-view-hidden, .property-content-hidden { display: none; diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index b9c7f60b..0d347336 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -11,8 +11,9 @@ --theme-sidebar-background: #000000; --theme-contrast-background: #402800; --theme-contrast-border: #A09090; + --theme-contrast-background2: #795900; - --theme-tab-toolbar-background: #.252c33; +/* --theme-tab-toolbar-background: #.252c33; */ --theme-toolbar-background: #000000; --theme-hover-background: #FFCF00; --theme-hover-color: #000000; diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css index a3e77c69..c0939c8e 100644 --- a/LCARStrek/browser/devtools/performance.css +++ b/LCARStrek/browser/devtools/performance.css @@ -435,3 +435,173 @@ /* Text inside a selected item should not be custom colored. */ color: inherit !important; } + +/* Profile call tree */ + +.call-tree-headers-container { + border-top: 1px solid var(--theme-splitter-color); +} + +.call-tree-cells-container { + /* Hack: force hardware acceleration */ + transform: translateZ(1px); + overflow: auto; +} + +.call-tree-cells-container[categories-hidden] .call-tree-category { + display: none; +} + +.call-tree-header[type="duration"], +.call-tree-cell[type="duration"], +.call-tree-header[type="self-duration"], +.call-tree-cell[type="self-duration"] { + width: 9em; +} + +.call-tree-header[type="percentage"], +.call-tree-cell[type="percentage"], +.call-tree-header[type="self-percentage"], +.call-tree-cell[type="self-percentage"] { + width: 6em; +} + +.call-tree-header[type="samples"], +.call-tree-cell[type="samples"] { + width: 5em; +} + +.call-tree-header[type="function"], +.call-tree-cell[type="function"] { + -moz-box-flex: 1; +} + +.call-tree-header, +.call-tree-cell { + -moz-box-align: center; + overflow: hidden; + padding: 1px 4px; +} + +.call-tree-header:not(:last-child), +.call-tree-cell:not(:last-child) { + -moz-border-end: 1px solid; +} + +.call-tree-header, +.call-tree-cell { + -moz-border-end-color: var(--theme-splitter-color); + color: var(--theme-body-color); +} + +.call-tree-header:not(:last-child) { + text-align: center; +} + +.call-tree-cell:not(:last-child) { + text-align: end; +} + +.call-tree-header { + background-color: var(--theme-toolbar-background); +} + +.call-tree-item:last-child:not(:focus) { + border-bottom: 1px solid var(--theme-splitter-color); +} + +.call-tree-item:nth-child(2n) { + background-color: var(--theme-contrast-background); +} + +.call-tree-item:hover { + background-color: var(--theme-hover-background); + color: var(--theme-hover-color); +} + +.call-tree-item:focus { + background-color: var(--theme-selection-background); +} + +.call-tree-item:focus label { + color: var(--theme-selection-color); +} + +.call-tree-item:focus .call-tree-cell { + -moz-border-end-color: var(--theme-splitter-color); +} + +.call-tree-item:not([origin="content"]) .call-tree-name, +.call-tree-item:not([origin="content"]) .call-tree-url, +call-tree-item:not([origin="content"]) .call-tree-line { + /* Style chrome and non-JS nodes differently. */ + opacity: 0.6; +} + +.call-tree-url { + -moz-margin-start: 4px !important; + cursor: pointer; +} + +.call-tree-url:hover { + text-decoration: underline; +} + +.call-tree-url { + color: var(--theme-text-blue); +} + +.call-tree-line { + color: var(--theme-contrast-border); +} + +.call-tree-host { + -moz-margin-start: 8px !important; + font-size: 90%; +} + +.call-tree-host { + color: ver(--theme-body-color); +} + +.call-tree-url[value=""], +.call-tree-line[value=""], +.call-tree-host[value=""] { + display: none; +} + +.call-tree-zoom { + -moz-appearance: none; + background-color: transparent; + background-position: center; + background-repeat: no-repeat; + background-size: 11px; + min-width: 11px; + -moz-margin-start: 8px !important; + cursor: zoom-in; + opacity: 0; +} + +.call-tree-zoom { + background-image: url(magnifying-glass.png); +} + +@media (min-resolution: 2dppx) { + .call-tree-zoom { + background-image: url(magnifying-glass@2x.png); + } +} + +.call-tree-item:hover .call-tree-zoom { + transition: opacity 0.3s ease-in; + opacity: 1; +} + +.call-tree-item:hover .call-tree-zoom:hover { + opacity: 0; +} + +.call-tree-category { + transform: scale(0.75); + transform-origin: center right; +} diff --git a/LCARStrek/browser/devtools/timeline.css b/LCARStrek/browser/devtools/timeline.css index 64945fe5..08a18904 100644 --- a/LCARStrek/browser/devtools/timeline.css +++ b/LCARStrek/browser/devtools/timeline.css @@ -70,20 +70,13 @@ pointer-events: none; } -.theme-dark .waterfall-marker-container:not([is-spacer]):nth-child(2n) { - background-color: rgba(255,255,255,0.03); +.waterfall-marker-container:not([is-spacer]):nth-child(2n) { + background-color: var(--theme-contrast-background); } -.theme-light .waterfall-marker-container:not([is-spacer]):nth-child(2n) { - background-color: rgba(128,128,128,0.03); -} - -.theme-dark .waterfall-marker-container:hover { - background-color: rgba(255,255,255,0.1) !important; -} - -.theme-light .waterfall-marker-container:hover { - background-color: rgba(128,128,128,0.1) !important; +.waterfall-marker-container:hover { + background-color: var(--theme-hover-background) !important; + color: var(--theme-hover-color) !important; } .waterfall-marker-item { @@ -147,7 +140,7 @@ .waterfall-marker-container.selected .waterfall-marker-bullet, .waterfall-marker-container.selected .waterfall-marker-bar { - border-color: initial!important; + border-color: initial !important; } #timeline-waterfall-details { diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 0d6110bd..2dc7892d 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -1069,7 +1069,7 @@ } .table-chart-totals { - border-top: 1px solid #A09090; /* Grey foreground text */ + border-top: 1px solid var(--theme-body-color-alt); /* Grey foreground text */ } .table-chart-summary-label { @@ -1078,7 +1078,7 @@ } .table-chart-summary-label { - color: #A09090; /* Light foreground text */ + color: var(--theme-content-color2); } /* Table Widget */ @@ -1091,10 +1091,8 @@ .table-widget-body { overflow: auto; -} -.table-widget-body { - background: #000000; /* Background-Sidebar */ + background: var(--theme-sidebar-background); } .table-widget-body:-moz-locale-dir(ltr) { @@ -1177,7 +1175,7 @@ .table-widget-cell { border-top: 1px solid #A09090; border-bottom: 1px solid #A09090; - color: #FF9F00; /* Light foreground text */ + color: var(--theme-body-color); } .theme-dark:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), @@ -1196,7 +1194,7 @@ @keyframes flash-out { to { - background: #795900; + background: var(--theme-contrast-background2); } } -- 2.43.0