From b3bf08b110943f4abc9642b613f0dcb078c22b0b Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 29 Mar 2015 21:00:55 +0200
Subject: [PATCH] first part of syncing LCARStrek with Firefox 37 windows theme
changes
---
LCARStrek/browser/browser.css | 6 ++
.../browser/customizableui/panelUIOverlay.css | 2 +-
LCARStrek/browser/devtools/dark-theme.css | 18 ++--
LCARStrek/browser/devtools/debugger.css | 4 +-
LCARStrek/browser/devtools/layoutview.css | 7 +-
.../browser/devtools/performance-icons.svg | 42 ++++++++
LCARStrek/browser/devtools/performance.css | 4 -
LCARStrek/browser/devtools/widgets.css | 9 +-
.../preferences/in-content/preferences.css | 94 ++----------------
LCARStrek/global/listbox.css | 20 +++-
LCARStrek/global/tree/sort-asc.gif | Bin 74 -> 53 bytes
LCARStrek/global/tree/sort-desc.gif | Bin 54 -> 54 bytes
12 files changed, 98 insertions(+), 108 deletions(-)
create mode 100644 LCARStrek/browser/devtools/performance-icons.svg
diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 71579fb9..73a1ab9c 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -2757,6 +2757,12 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
color: #000000;
}
+/* Handle a case where the last separator in a customized tab bar with a
+ separated new tab button causes the width of the tab to extend and causes
+ jittering with a small tab curve width (Bug 1111091). */
+#TabsToolbar[currentset]:not([currentset*="tabbrowser-tabs,new-tab-button"]) #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after {
+}
+
/* New tab button */
.tabs-newtab-button {
diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css
index 98f5bba2..e0625fce 100644
--- a/LCARStrek/browser/customizableui/panelUIOverlay.css
+++ b/LCARStrek/browser/customizableui/panelUIOverlay.css
@@ -553,7 +553,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
list-style-image: url("chrome://browser/skin/syncFx-horizontalbar.png");
}
-#PanelUI-fxa-status[status="active"] {
+#PanelUI-fxa-status[syncstatus="active"] {
list-style-image: url("chrome://browser/skin/syncFxProgress-horizontalbar.png");
}
diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index 98b3d7a4..54b0221a 100644
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -402,15 +402,6 @@ div.CodeMirror span.eval-text {
border-bottom: 0;
}
-.devtools-horizontal-splitter {
-/* border-bottom: 1px solid var(--theme-splitter-color); */
-}
-
-.devtools-side-splitter {
-/* -moz-border-end: 1px solid var(--theme-splitter-color);
- border-color: var(--theme-splitter-color); / Needed for responsive container at low width. */
-}
-
.devtools-textinput,
.devtools-searchinput {
background-color: #000000;
@@ -975,4 +966,13 @@ div.CodeMirror span.eval-text {
display: none;
}
+.devtools-horizontal-splitter {
+/* border-bottom: 1px solid var(--theme-splitter-color); */
+}
+
+.devtools-side-splitter {
+/* -moz-border-end: 1px solid var(--theme-splitter-color);
+ border-color: var(--theme-splitter-color); / Needed for responsive container at low width. */
+}
+
/* === END toolbars.inc.css === */
diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index c91b191f..89c6e02c 100644
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -91,11 +91,11 @@ window {
color: #8050B0;
}
-#sources .selected > .black-boxed {
+#sources .selected .black-boxed {
color: #000000;
}
-#sources .black-boxed > .dbg-breakpoint {
+#sources .black-boxed ~ .dbg-breakpoint {
display: none;
}
diff --git a/LCARStrek/browser/devtools/layoutview.css b/LCARStrek/browser/devtools/layoutview.css
index d1f33c07..b567c08f 100644
--- a/LCARStrek/browser/devtools/layoutview.css
+++ b/LCARStrek/browser/devtools/layoutview.css
@@ -10,7 +10,12 @@
background-color: #FF9F00;
border-color: #A09090;
border-style: dotted;
- color: #000000;
+ color: var(--theme-selection-color);
+}
+
+.margin,
+.size {
+ color: var(--theme-selection-color);
}
#content {
diff --git a/LCARStrek/browser/devtools/performance-icons.svg b/LCARStrek/browser/devtools/performance-icons.svg
new file mode 100644
index 00000000..7c28d607
--- /dev/null
+++ b/LCARStrek/browser/devtools/performance-icons.svg
@@ -0,0 +1,42 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px">
+<style>
+ g {
+ fill: #FFCF00;
+ }
+ g:not(:target) {
+ display: none;
+ }
+</style>
+<g id="overview-markers">
+ <rect x="0px" y="3px" width="5px" height="2.5px" rx="1" ry="1"/>
+ <rect x="7px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
+ <rect x="0px" y="7px" width="9px" height="2.5px" rx="1" ry="1"/>
+ <rect x="10px" y="7px" width="6px" height="2.5px" rx="1" ry="1"/>
+ <rect x="4px" y="11px" width="5px" height="2.5px" rx="1" ry="1"/>
+ <rect x="12px" y="11px" width="4px" height="2.5px" rx="1" ry="1"/>
+</g>
+<g id="overview-frames">
+ <rect x="1px" y="4px" width="2px" height="12px" rx="1" ry="1"/>
+ <rect x="5px" y="12px" width="2px" height="4px" rx="1" ry="1"/>
+ <rect x="9px" y="9px" width="2px" height="7px" rx="1" ry="1"/>
+ <rect x="13px" y="7px" width="2px" height="9px" rx="1" ry="1"/>
+</g>
+<g id="details-waterfall">
+ <rect x="0px" y="3px" width="9px" height="2.5px" rx="1" ry="1"/>
+ <rect x="5px" y="7px" width="8px" height="2.5px" rx="1" ry="1"/>
+ <rect x="7px" y="11px" width="9px" height="2.5px" rx="1" ry="1"/>
+</g>
+<g id="details-call-tree">
+ <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
+ <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
+ <rect x="0px" y="9px" width="11px" height="2px" rx="1" ry="1"/>
+ <rect x="0px" y="12px" width="6px" height="2px" rx="1" ry="1"/>
+</g>
+<g id="details-flamegraph">
+ <rect x="0px" y="3px" width="16px" height="2px" rx="1" ry="1"/>
+ <rect x="0px" y="6px" width="8px" height="2px" rx="1" ry="1"/>
+ <rect x="10px" y="6px" width="6px" height="2px" rx="1" ry="1"/>
+ <rect x="2px" y="9px" width="6px" height="2px" rx="1" ry="1"/>
+ <rect x="5px" y="12px" width="3px" height="2px" rx="1" ry="1"/>
+</g>
+</svg>
diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css
index c0939c8e..98acfe04 100644
--- a/LCARStrek/browser/devtools/performance.css
+++ b/LCARStrek/browser/devtools/performance.css
@@ -438,10 +438,6 @@
/* 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);
diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css
index 2dc7892d..2979d74c 100644
--- a/LCARStrek/browser/devtools/widgets.css
+++ b/LCARStrek/browser/devtools/widgets.css
@@ -40,11 +40,18 @@
}
.devtools-responsive-container > .devtools-side-splitter {
+ /* This is a normally vertical splitter, but we have turned it horizontal
+ due to the smaller resolution */
border: 0;
margin: 0;
min-height: 3px;
height: 3px;
- margin-bottom: -3px;
+ margin-top: -3px;
+
+ /* Reset the vertical splitter styles */
+ width: auto;
+ min-width: 0;
+
/* In some edge case the cursor is not changed to n-resize */
cursor: n-resize;
}
diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 38c1351d..2b56f30a 100644
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -163,6 +163,12 @@ treecol {
-moz-image-region: rect(24px, 168px, 48px, 144px);
}
+@media (max-width: 800px) {
+ .category-name {
+ display: none;
+ }
+}
+
/* header */
#header-advanced {
@@ -200,81 +206,8 @@ treecol {
-moz-margin-start: 0;
}
-#handlersView {
- -moz-margin-start: 0;
- font-size: 1.25rem;
- line-height: 22px;
- border: none; /*1px solid #9C9CFF;*/
- margin: 0;
- overflow-y: auto;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- height: 500px;
-}
-
-#handlersView > listheader > treecol {
-}
-
-#handlersView > scrollbox {
- border-left: 1px solid #9C9CFF;
- border-right: 1px solid #9C9CFF;
- border-bottom: 1px solid #9C9CFF;
-}
-
-#handlersView > listheader {
- background: transparent;
- border: 0;
- padding: 0;
-}
-
-#typeColumn,
-#actionColumn {
- line-height: 20px;
-/* color: #737980;
- height: 36px;
- padding: 0 10px;
- background-color: #F7F7F7;
- border: 1px solid #CCCCCC;
- -moz-border-top-colors: none;
- -moz-border-right-colors: none;
- -moz-border-bottom-colors: none;
- -moz-border-left-colors: none;
-*/
-}
-
-#typeColumn:-moz-locale-dir(ltr),
-#actionColumn:-moz-locale-dir(rtl) {
- border-top-left-radius: 5px;
-}
-
-#typeColumn:-moz-locale-dir(rtl),
-#actionColumn:-moz-locale-dir(ltr) {
- border-top-right-radius: 5px;
-}
-/*
-#typeColumn:hover,
-#actionColumn:hover {
- border-color: #737980;
-}
-
-#typeColumn:hover:active,
-#actionColumn:hover:active {
- padding: 0 10px;
- border-color: #0096DC;
-}
-*/
-#typeColumn > .treecol-sortdirection[sortDirection=ascending],
-#actionColumn > .treecol-sortdirection[sortDirection=ascending],
-#typeColumn > .treecol-sortdirection[sortDirection=descending],
-#actionColumn > .treecol-sortdirection[sortDirection=descending] {
-}
-
-#typeColumn > .treecol-sortdirection[sortDirection=descending],
-#actionColumn > .treecol-sortdirection[sortDirection=descending] {
-}
-
#handlersView > richlistitem {
- min-height: 40px !important;
+ min-height: 36px !important;
}
.typeIcon {
@@ -288,8 +221,7 @@ treecol {
}
.actionsMenu {
- height: 40px;
- max-height: 40px;
+ min-height: 36px;
}
.actionsMenu > menupopup > menuitem {
@@ -306,16 +238,6 @@ description > html|a {
cursor: pointer;
}
-#offlineAppsList,
-#syncEnginesList {
-/* -moz-appearance: none;
- color: #737980;
- padding: 10px;
- border: 1px solid rgba(23,50,77,0.4);
- border-radius: 5px;
- background-color: #F1F1F1;*/
-}
-
#noFxaAccount {
/* Overriding the margins from the base preferences.css theme file.
These overrides can be simplified by fixing bug 1027174 */
diff --git a/LCARStrek/global/listbox.css b/LCARStrek/global/listbox.css
index 1d750655..b8fe1d93 100644
--- a/LCARStrek/global/listbox.css
+++ b/LCARStrek/global/listbox.css
@@ -52,14 +52,26 @@ listbox:focus > listitem[selected="true"] {
listheader {
-moz-box-align: center;
- border: 1px solid #FFCF00;
+ border: 1px solid #FF9F00;
+ border-left-top-radius: 3px;
+ border-right-top-radius: 3px;
background-color: #9C9CFF;
color: #000000;
- padding: 0 4px;
+ padding: 0;
+}
+
+listheader > treecol {
+ -moz-border-start: none;
+ border-top: none;
+ border-bottom: none;
+}
+
+listheader > treecol:last-child {
+ -moz-border-end: none;
}
listheader[sortable="true"]:hover:active {
- border: 1px solid #FFCF00;
+ border: 1px solid #FF9F00;
padding-top: 1px;
padding-bottom: 0px;
-moz-padding-start: 5px;
@@ -71,7 +83,7 @@ listheader[sortable="true"]:hover:active {
}
.listheader-label {
- margin: 0px !important;
+ margin: 0 4px !important;
}
/* ..... sort direction icon ..... */
diff --git a/LCARStrek/global/tree/sort-asc.gif b/LCARStrek/global/tree/sort-asc.gif
index 70ee76e0b0e529b450cdf6634c2d5fdb6f3059b5..0ff878537cf6fe5965d079f7871e7eda42842691 100755
GIT binary patch
delta 30
kcmeY=m2mfTv#?C$U|?rxU}OM-|Ns9h{$yd~ny4!a0Bgbr(EtDd
delta 51
zcmXr@(slQAv#?C$U|?rxU}X3|pW*-i|BC+vor_WvOHxx5$}>wc6x=<10~i#4vM@4C
Hl#m4guK*Bs
diff --git a/LCARStrek/global/tree/sort-desc.gif b/LCARStrek/global/tree/sort-desc.gif
index a3db498368525be93fed80eca0776a82d1bfcb53..3fa549072578f80f721ee127e019706fc67a4a36 100755
GIT binary patch
delta 30
kcmXprlW_NRv#?C$U|?rxU}OM-|Ns9h{$yd~nkXR$0BK$assI20
delta 30
mcmXprlW_NRv#?C$U|?rxU}X3|pW*-i|B63Z7#Su?$N>O<I|)7j
--
2.43.0