X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fdevtools%2Fdark-theme.css;h=b22769f3a4ae051ced34e124c3218c41796e9750;hp=1598355f1062f2617bc301cb82e999375bd6e387;hb=d533ec21de421974d60dc2614105c2e439f34b49;hpb=649b5d38865cb338a3419ffda9ff41382c2c9523

diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index 1598355f..b22769f3 100644
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -6,38 +6,83 @@
 /* According to:
  * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
  */
+:root {
+  --theme-body-background: #000000;
+  --theme-sidebar-background: #000000;
+  --theme-contrast-background: #402800;
+  --theme-contrast-border: #A09090;
+  --theme-contrast-background2: #795900;
+
+/*  --theme-tab-toolbar-background: #.252c33; */
+  --theme-toolbar-background: #000000;
+  --theme-hover-background: #FFCF00;
+  --theme-hover-color: #000000;
+  --theme-active-background: #FFCF00;
+  --theme-active-color: #000000;
+  --theme-selection-background: #008484;
+  --theme-selection-color: #000000;
+  --theme-selection-background2: #004242;
+  --theme-selection-color2: #FF9F00;
+  --theme-selection-background-semitransparent: rgba(0, 132, 132, .5);
+  --theme-splitter-color: #9C9CFF;
+  --theme-comment: #A09090;
+
+  --theme-contrastsidebar-background: #A09090;
+  --theme-contrastsidebar-color: #000000;
+  --theme-contrastsidebar-bordercolor: #000000;
+
+  --theme-body-color: #FF9F00;
+  --theme-body-color-alt: #A09090;
+  --theme-content-color1: #FF9F00;
+  --theme-content-color2: #A09090;
+  --theme-content-color3: #FF9F00;
+  --theme-content-disabled: #8050B0;
+
+  --theme-text-blue: #3333FF;
+  --theme-highlight-green: #008484;
+  --theme-highlight-blue: #9C9CFF;
+  --theme-highlight-bluegrey: #A09090;
+  --theme-highlight-purple: #C09070;
+  --theme-highlight-darkpurple: #6000CF;
+  --theme-highlight-lightorange: #FFCF00;
+  --theme-highlight-orange: #FF9F00;
+  --theme-highlight-red: #FF0000;
+  --theme-highlight-pink: #E7ADE7;
+}
+
 .theme-body {
-  background: #000000;
-  color: #FF9F00;
+  background: var(--theme-body-background);
+  color: var(--theme-body-color);
 }
 
 .theme-sidebar {
-  background: #000000;
-  color: #FF9F00;
+  background: var(--theme-sidebar-background);
+  color: var(--theme-content-color1);
 }
 
 ::-moz-selection {
-  background-color: #008484;
-  color: #FFCF00;
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-darker {
-  background-color: rgba(0,0,0,0.5);
+  background: var(--theme-selection-background-semitransparent);
 }
 
-.theme-selected {
-  background: #004242;
-  color: #FF9F00; /* Light foreground text */
+.theme-selected,
+.CodeMirror-hint-active {
+  background-color: var(--theme-selection-background2);
+  color: var(--theme-selection-color2);
 }
 
 .theme-bg-contrast,
-.variable-or-property:not([overridden])[changed] { /* contrast bg color to attract attention on a container */
-  background: #402800;
+.variable-or-property:not([overridden])[changed] {
+  background: var(--theme-contrast-background);
 }
 
 .theme-link,
 .cm-s-mozilla .cm-link { /* original: blue */
-  color: #3333FF;
+  color: var(--theme-text-blue);
 }
 
 /*
@@ -45,8 +90,9 @@
  * failures in debug builds.
  */
 .theme-link:visited,
-.cm-s-mozilla .cm-link:visited { /* original: blue */
-  color: #3333FF;
+.cm-s-mozilla .cm-link:visited,
+.CodeMirror-Tern-type {
+  color: var(--theme-text-blue);
 }
 
 .theme-comment,
@@ -54,13 +100,14 @@
 .cm-s-mozilla .cm-hr,
 .cm-s-mozilla .cm-comment,
 .variable-or-property .token-undefined,
-.variable-or-property .token-null { /* original: grey */
-  color: #A09090;
+.variable-or-property .token-null,
+.CodeMirror-Tern-completion-unknown:before {
+  color: var(--theme-comment);
 }
 
 .theme-gutter {
   background-color: #000000;
-  color: #FF9F00;
+  color: var(--theme-content-color3);
   border-color: #9C9CFF;
 }
 
@@ -72,8 +119,12 @@
 .cm-s-mozilla .cm-number,
 .variable-or-property .token-number,
 .variable-or-property[return] > .title > .name,
-.variable-or-property[scope] > .title > .name { /* original: green */
-  color: #008484;
+.variable-or-property[scope] > .title > .name {
+  color: var(--theme-highlight-green);
+}
+
+.CodeMirror-Tern-completion-number:before {
+  background-color: #008484;
 }
 
 .theme-fg-color2,
@@ -82,34 +133,57 @@
 .cm-s-mozilla .cm-def,
 .cm-s-mozilla .cm-property,
 .cm-s-mozilla .cm-qualifier,
-.variables-view-variable > .title > .name { /* original: blue */
-  color: #9C9CFF;
+.variables-view-variable > .title > .name {
+  color: var(--theme-highlight-blue);
+}
+
+.CodeMirror-Tern-completion-object:before {
+  background-color: #9C9CFF;
+}
+
+.cm-s-mozilla .cm-unused-line {
+  text-decoration: line-through;
+  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,
 .cm-s-mozilla .cm-header,
+.cm-s-mozilla .cm-bracket,
 .variables-view-property > .title > .name,
-.variable-or-property[safe-getter] > .title > .name { /* original: pink/lavender */
-  color: #E7ADE7;
+.variable-or-property[safe-getter] > .title > .name {
+  color: var(--theme-highlight-pink);
 }
 
-.theme-fg-color4 { /* original: purple/violet */
-  color: #C09070;
+.CodeMirror-Tern-completion-array:before {
+  color: var(--theme-highlight-pink); /* var(--theme-highlight-bluegrey) */
+}
+
+.theme-fg-color4 {
+  color: var(--theme-highlight-purple);
 }
 
 .theme-fg-color5,
-.cm-s-mozilla .cm-bracket,
-.cm-s-mozilla .cm-keyword { /* original: Yellow */
-  color: #FFCF00;
+.cm-s-mozilla .cm-keyword {
+  color: var(--theme-highlight-lightorange);
 }
 
 .theme-fg-color6,
 .cm-s-mozilla .cm-string,
 .cm-s-mozilla .cm-string-2,
-.variable-or-property .token-string { /* original: Orange */
-  color: #E7ADE7;
+.variable-or-property .token-string,
+.CodeMirror-Tern-farg {
+  color: var(--theme-highlight-pink); /* -orange? */
+}
+
+.CodeMirror-Tern-completion-string:before,
+.CodeMirror-Tern-completion-fn:before {
+  background-color: #E7ADE7;
 }
 
 .theme-fg-color7,
@@ -118,8 +192,12 @@
 .cm-s-mozilla .cm-error,
 .variable-or-property .token-boolean,
 .variable-or-property .token-domnode,
-.variable-or-property[exception] > .title > .name { /* original: Red */
-  color: #FF0000;
+.variable-or-property[exception] > .title > .name {
+  color: var(--theme-highlight-red);
+}
+
+.CodeMirror-Tern-completion-bool:before {
+  background-color: #FF0000;
 }
 
 .variable-or-property .token-domnode {
@@ -128,7 +206,11 @@
 
 .theme-toolbar,
 .devtools-toolbar,
-.devtools-sidebar-tabs > tabs { /* General toolbar styling */
+.devtools-sidebar-tabs tabs,
+.devtools-sidebar-alltabs,
+.CodeMirror-dialog { /* General toolbar styling */
+/*  color: var(--theme-body-color-alt);
+  background-color: var(--theme-toolbar-background);*/
 }
 
 
@@ -138,8 +220,8 @@
 
 .ruleview-colorswatch,
 .computedview-colorswatch,
-.markupview-colorswatch {
-/*  box-shadow: 0 0 0 1px rgba(0,0,0,0.5); */
+.ruleview-bezierswatch {
+/*  box-shadow: 0 0 0 1px #818181; */
 }
 
 .variables-view-scope:focus > .title,
@@ -162,8 +244,8 @@
 .cm-s-mozilla .cm-variable-2,
 .cm-s-mozilla .cm-variable-3,
 .cm-s-mozilla .cm-operator,
-.cm-s-mozilla .cm-special { /* theme-body color */
-  color: #FF9F00;
+.cm-s-mozilla .cm-special {
+  color: var(--theme-content-color1);
 }
 
 .cm-s-mozilla .CodeMirror-lines .CodeMirror-cursor {
@@ -213,12 +295,12 @@ div.CodeMirror span.eval-text {
 }
 
 .cm-s-mozilla .CodeMirror-linenumber { /* line number text */
-  color: #A09090;
+  color: var(--theme-content-color2);
 }
 
 .cm-s-mozilla .CodeMirror-gutters { /* vertical line next to line numbers */
-  border-right-color: #A09090;
-  background-color: #402800;
+  border-right-color: var(--theme-contrast-border);
+  background-color: var(--theme-contrast-background);
 }
 
 .cm-s-markup-view pre {
@@ -248,6 +330,10 @@ div.CodeMirror span.eval-text {
   background-position: -14px -14px;
 }
 
+.theme-twisty[invisible] {
+  visibility: hidden;
+}
+
 .theme-checkbox {
   display: inline-block;
   border: 0;
@@ -315,124 +401,232 @@ 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;
 }
 
-.devtools-horizontal-splitter {
+.devtools-textinput,
+.devtools-searchinput {
+  background-color: #000000;
+  color: #E7ADE7;
 }
 
-.devtools-side-splitter {
+.CodeMirror-Tern-fname {
+  color: #A09090;
 }
 
-.devtools-textinput,
-.devtools-searchinput {
+.CodeMirror-hints,
+.CodeMirror-Tern-tooltip {
   background-color: #000000;
-  color: #E7ADE7;
+  color: var(--theme-body-color);
 }
 
 /* === BEGIN toolbars.inc.css === */
 
+/* Toolbars */
+.devtools-toolbar,
+.devtools-sidebar-tabs tabs,
+.devtools-sidebar-alltabs {
+}
+
 .devtools-toolbar {
 }
 
-/* LCARStrek checkbox colors don't work well against toolbar background */
-.devtools-toolbar > checkbox {
-  background-color: #000000;
+.devtools-toolbar checkbox {
+  /* LCARStrek checkbox colors don't work well against toolbar background */
+  background-color: var(--theme-toolbar-background);
   padding: 2px;
 }
+.devtools-toolbar checkbox .checkbox-check {
+}
+.devtools-toolbar checkbox .checkbox-label-box {
+}
+.devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
+}
 
-devtools-menulist:-moz-focusring,
+/* Toolbar buttons */
+.devtools-menulist,
+.devtools-toolbarbutton {
+/*  transition: background 0.05s ease-in-out; */
+}
+
+.devtools-menulist:-moz-focusring,
 .devtools-toolbarbutton:-moz-focusring {
-  outline: 1px dotted #008484;
+  outline: 1px dotted var(--theme-selection-color);
 }
 
-.devtools-toolbarbutton > .toolbarbutton-icon {
+.devtools-toolbarbutton[standalone] {
+}
+.devtools-toolbarbutton[label][standalone] {
 }
 
-.devtools-toolbarbutton:not([label]) {
+.devtools-toolbarbutton:not([label]),
+.devtools-toolbarbutton[text-as-image] {
   min-width: 20px;
 }
 
+#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
+  min-width: inherit;
+}
+
+/* Command buttons with menupopups should be styled slightly differently -
+   no background color and a bit more narrow */
+#toolbox-buttons .devtools-toolbarbutton:not([text-as-image]):not(:hover):not([open=true]) {
+  background: transparent;
+}
+#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
+  padding: 0 2px;
+}
+
 .devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
   display: none;
 }
 
-.devtools-toolbarbutton > .toolbarbutton-menubutton-button {
-  /*-moz-box-orient: horizontal;*/
+.devtools-toolbar .devtools-toolbarbutton {
+  -moz-margin-start: 2px;
+}
+
+.devtools-toolbarbutton > .toolbarbutton-icon {
+}
+
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+/*  -moz-box-orient: horizontal; */
+}
+
+.devtools-toolbarbutton[type=menu-button] {
+}
+
+.devtools-toolbarbutton > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+}
+
+.devtools-menulist > .menulist-dropmarker {
+}
+
+.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
 }
 
 .devtools-menulist,
 .devtools-toolbarbutton {
 }
 
-.devtools-toolbarbutton:not([checked]):hover:active {
+/* Text-only buttons */
+.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
+#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
+/*  background-color: rgba(0, 0, 0, .2); / Splitter */
 }
 
-.devtools-menulist[open=true],
-.devtools-toolbarbutton[open=true],
-.devtools-toolbarbutton[checked] {
+/* Button States */
+.devtools-toolbarbutton:not([disabled]):hover,
+#toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
+.devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover {
+/*  background: rgba(0, 0, 0, .3); / Splitters */
+}
+
+.devtools-toolbarbutton:not([disabled]):hover:active,
+#toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
+.devtools-toolbarbutton:not([disabled])[label]:not([text-as-image]):not([type=menu-button]):hover:active {
+/*  background: rgba(0, 0, 0, .4); / Splitters */
 }
 
-.devtools-toolbarbutton[checked] {
+/* Menu type buttons and checked states */
+.devtools-toolbarbutton[checked=true],
+#toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
+/*  background: rgba(29, 79, 115, .7); / Select highlight blue /
+  color: var(--theme-selection-color); */
 }
 
-.devtools-toolbarbutton[checked]:hover:active {
+.devtools-menulist[open=true],
+.devtools-toolbarbutton[open=true],
+.devtools-toolbarbutton[open=true]:hover,
+.devtools-toolbarbutton[open=true]:hover:active,
+.devtools-toolbarbutton[checked=true],
+.devtools-toolbarbutton[checked=true]:hover,
+#toolbox-buttons .devtools-toolbarbutton[text-as-image][checked] {
+/*  background: rgba(29, 79, 115, .8); / Select highlight blue /
+  color: var(--theme-selection-color); */
+}
+
+.devtools-toolbarbutton[checked=true]:hover {
 }
 
 .devtools-option-toolbarbutton {
-  list-style-image: url("chrome://browser/skin/devtools/option-icon.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://browser/skin/devtools/tool-options-tbutton.svg");
 /*  background: none;
   border: none; */
 }
 
 .devtools-option-toolbarbutton:hover,
 .devtools-option-toolbarbutton[open=true] {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  list-style-image: url("chrome://browser/skin/devtools/tool-options.svg");
 }
 
-.devtools-menulist > .menulist-label-box {
-  text-align: center;
+/* Toolbar button groups */
+.devtools-toolbarbutton-group > .devtools-toolbarbutton {
 }
 
-.devtools-menulist > .menulist-dropmarker {
+.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
 }
 
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+.devtools-toolbarbutton-group + .devtools-toolbarbutton {
 }
 
-.devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
+.devtools-separator + .devtools-toolbarbutton {
 }
 
-.devtools-toolbarbutton[type=menu-button] {
-  padding: 0 1px;
-  -moz-box-align: stretch;
+/* HTML buttons, similar to toolbar buttons, but work in HTML documents */
+
+.devtools-button {
+  border: 0 solid var(--theme-splitter-color);
+  background: var(--theme-toolbar-background);
+  margin: 0;
+  padding: 0;
+  min-width: 32px;
+  min-height: 18px;
+  /* The icon is absolutely positioned in the button using ::before */
+  position: relative;
 }
 
-.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-box-align: center;
+.devtools-button[standalone] {
+  min-height: 32px;
+  border-width: 1px;
 }
 
-/* Toolbar button groups */
-.devtools-toolbarbutton-group > .devtools-toolbarbutton {
+/* Button States */
+.devtools-button:not([disabled]):hover {
+  background: var(--theme-hover-background);
+  color: var(--theme-hover-color);
 }
 
-.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-of-type {
+.devtools-button:not([disabled]):hover:active {
+  background: var(--theme-active-background);
+  color: var(--theme-active-color);
 }
 
-.devtools-toolbarbutton-group {
-/*
-  margin: 0 2px;
-  -moz-padding-end: 2px;
-  border-left: 3px solid #000000;
-  border-right: 3px solid #000000;
-*/
+/* Menu type buttons and checked states */
+.devtools-button[checked] {
+  background: var(--theme-selection-background);
+  color: var(--theme-selection-color);
+}
+
+.devtools-button::before {
+  content: "";
+  display: block;
+  width: 16px;
+  height: 16px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  margin: -8px 0 0 -8px;
+  background-repeat: no-repeat;
+}
+
+@media (min-resolution: 2dppx) {
+  .devtools-button::before {
+    background-size: 32px;
+  }
 }
 
 /* Text input */
@@ -449,8 +643,9 @@ devtools-menulist:-moz-focusring,
 }
 
 .devtools-searchinput {
-/*  padding-top: 3px;
-  padding-bottom: 3px;*/
+/*  margin-top: 1px;
+  margin-bottom: 1px;
+  padding: 0;*/
   -moz-padding-start: 22px;
   -moz-padding-end: 12px;
   background-position: 8px center;
@@ -476,7 +671,7 @@ devtools-menulist:-moz-focusring,
 }
 
 .devtools-no-search-result {
-  border-color: #FF0000 !important;
+  border-color: var(--theme-highlight-red) !important;
 }
 
 /* Close button */
@@ -515,17 +710,28 @@ devtools-menulist:-moz-focusring,
   border: 0;
 }
 
-.devtools-sidebar-tabs > tabs {
+.devtools-sidebar-tabs tabs {
   position: static;
   overflow: hidden;
 }
 
-.devtools-sidebar-tabs > tabs > .tabs-right,
-.devtools-sidebar-tabs > tabs > .tabs-left {
+.devtools-sidebar-alltabs {
+/*  margin: 0;
+  border-width: 0 0 1px 0;
+  -moz-border-start-width: 1px;
+  border-style: solid;*/
+}
+
+.devtools-sidebar-alltabs dropmarker {
   display: none;
 }
 
-.devtools-sidebar-tabs > tabs > tab {
+.devtools-sidebar-tabs tabs > .tabs-right,
+.devtools-sidebar-tabs tabs > .tabs-left {
+  display: none;
+}
+
+.devtools-sidebar-tabs tabs > tab {
   min-width: 78px;
   text-align: center;
   -moz-box-flex: 1;
@@ -533,62 +739,40 @@ devtools-menulist:-moz-focusring,
   margin-top: 0;
 }
 
-.devtools-sidebar-tabs > tabs > tab:-moz-focusring {
+.devtools-sidebar-tabs tabs > tab:-moz-focusring {
   position: static;
 }
 
-.devtools-sidebar-tabs > tabs > tab:last-of-type {
+.devtools-sidebar-tabs tabs > tab:last-of-type {
   -moz-border-end-width: 0;
 }
 
-.devtools-sidebar-tabs > tabs > tab:first-of-type {
-  -moz-margin-start: 0;
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab:not(:last-of-type) {
-}
-
-.devtools-sidebar-tabs:-moz-locale-dir(rtl) > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab:hover {
-}
-
-.devtools-sidebar-tabs > tabs > tab:hover:active {
+.devtools-sidebar-tabs tabs > tab:first-child {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab {
+.devtools-sidebar-tabs tabs > tab:hover {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover {
+.devtools-sidebar-tabs tabs > tab:hover:active {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active {
+.devtools-sidebar-tabs tabs > tab[selected] + tab {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected] {
+.devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected]:hover {
+.devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected]:hover:active {
+.devtools-sidebar-tabs tabs > tab[selected],
+.devtools-sidebar-tabs tabs > tab[selected]:hover:active {
 }
 
 /* Toolbox - moved from toolbox.css.
  * 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;
@@ -629,8 +813,18 @@ devtools-menulist:-moz-focusring,
 #toolbox-dock-side:hover {
 }
 
+.devtools-separator {
+  margin: 0 2px;
+  width: 2px;
+}
+
+#toolbox-buttons:empty + .devtools-separator,
+.devtools-separator[invisible] {
+  visibility: hidden;
+}
+
 #toolbox-controls-separator {
-  -moz-margin-start: 4px;
+  margin: 0;
 }
 
 /* Command buttons */
@@ -655,7 +849,8 @@ devtools-menulist:-moz-focusring,
 
 .command-button:hover > image,
 .command-button:hover:active > image,
-.command-button[checked=true] > image {
+.command-button[checked=true] > image,
+.command-button[open=true] > image {
   background-position: -16px center;
 }
 
@@ -663,6 +858,10 @@ devtools-menulist:-moz-focusring,
   background-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
 }
 
+#command-button-screenshot > image {
+  background-image: url("chrome://browser/skin/devtools/command-screenshot.png");
+}
+
 #command-button-responsive > image {
   background-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
 }
@@ -679,6 +878,10 @@ devtools-menulist:-moz-focusring,
   background-image: url("chrome://browser/skin/devtools/command-pick.png");
 }
 
+#command-button-frames > image {
+  background-image: url("chrome://browser/skin/devtools/command-frames.png");
+}
+
 #command-button-splitconsole > image {
   background-image: url("chrome://browser/skin/devtools/command-console.png");
 }
@@ -692,6 +895,10 @@ devtools-menulist:-moz-focusring,
     background-image: url("chrome://browser/skin/devtools/command-paintflashing@2x.png");
   }
 
+  #command-button-screenshot > image {
+    background-image: url("chrome://browser/skin/devtools/command-screenshot@2x.png");
+  }
+
   #command-button-responsive > image {
     background-image: url("chrome://browser/skin/devtools/command-responsivemode@2x.png");
   }
@@ -708,6 +915,10 @@ devtools-menulist:-moz-focusring,
     background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
   }
 
+  #command-button-frames > image {
+    background-image: url("chrome://browser/skin/devtools/command-frames@2x.png");
+  }
+
   #command-button-splitconsole > image {
     background-image: url("chrome://browser/skin/devtools/command-console@2x.png");
   }
@@ -741,12 +952,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; */
@@ -754,10 +959,6 @@ devtools-menulist:-moz-focusring,
   width: 16px; /* Prevents collapse during theme switching */
 }
 
-#toolbox-tab-options > image {
-/*  margin: 0 8px; */
-}
-
 .devtools-tab:hover > image {
 }
 
@@ -767,13 +968,13 @@ devtools-menulist:-moz-focusring,
 
 .devtools-tab:hover,
 .devtools-tab:hover:active {
-  background-color: #FFCF00;
-  color: #000000;
+  background-color: var(--theme-hover-background);
+  color: var(--theme-hover-color);
 }
 
 .devtools-tab[selected] {
-  background-color: #008484;
-  color: #000000;
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .devtools-tab > spacer {
@@ -815,9 +1016,55 @@ 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;
 }
 
+.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. */
+}
+/* Throbbers */
+
+.devtools-throbber::before {
+  content: "";
+  display: inline-block;
+  vertical-align: bottom;
+  -moz-margin-end: 0.5em;
+  width: 1em;
+  height: 1em;
+  border: 2px solid currentColor;
+  border-right-color: transparent;
+  border-radius: 50%;
+  animation: 1.1s linear throbber-spin infinite;
+}
+
+@keyframes throbber-spin {
+  from {
+    transform: none;
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 /* === END toolbars.inc.css === */