X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fdevtools%2Fdark-theme.css;h=7193fc78ef571ef56bfddafc3677febfa43095d5;hp=de85daceddfddbc91d8d019239409589bf41118e;hb=de5e780daa5242500976dde56483222a51ecdae5;hpb=3886293f5826c7e369d0045678b83cb57ab0e1ef

diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index de85dace..7193fc78 100644
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -6,58 +6,79 @@
 /* According to:
  * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
  */
-.theme-body {
-  background: #000000;
-  color: #FF9F00;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  width: 14px;
-  height: 14px;
-  background-repeat: no-repeat;
-  background-image: url("chrome://browser/skin/devtools/controls.png");
-  background-position: 0 -14px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty[open] {
-  background-position: -14px -14px;
+:root {
+  --theme-body-background: #000000;
+  --theme-sidebar-background: #000000;
+  --theme-contrast-background: #402800;
+  --theme-contrast-border: #A09090;
+
+  --theme-tab-toolbar-background: #.252c33;
+  --theme-toolbar-background: #000000;
+  --theme-hover-background: #FFCF00;
+  --theme-hover-color: #000000;
+  --theme-selection-background: #008484;
+  --theme-selection-color: #000000;
+  --theme-selection-background2: #004242;
+  --theme-selection-color2: #FF9F00;
+  --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-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background-image: url("chrome://browser/skin/devtools/controls.png");
-  background-position: 0 0;
+.theme-body {
+  background: var(--theme-body-background);
+  color: var(--theme-body-color);
 }
 
-.theme-checkbox[checked] {
-  background-position: -14px 0;
+.theme-sidebar {
+  background: var(--theme-sidebar-background);
+  color: var(--theme-content-color1);
 }
 
-.theme-selected {
-  background: #004242;
+::-moz-selection {
+  background-color: var(--theme-selection-background);
+  color: var(--theme-selection-color);
 }
 
 .theme-bg-darker {
   background-color: rgba(0,0,0,0.5);
 }
 
-.theme-bg-contrast { /* contrast bg color to attract attention on a container */
-  background: #404000;
+.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] {
+  background: var(--theme-contrast-background);
 }
 
 .theme-link,
 .cm-s-mozilla .cm-link { /* original: blue */
-  color: #3333FF;
+  color: var(--theme-text-blue);
 }
 
 /*
@@ -65,20 +86,24 @@
  * 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,
 .cm-s-mozilla .cm-meta,
 .cm-s-mozilla .cm-hr,
-.cm-s-mozilla .cm-comment { /* original: grey */
-  color: #A09090;
+.cm-s-mozilla .cm-comment,
+.variable-or-property .token-undefined,
+.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;
 }
 
@@ -87,8 +112,15 @@
 }
 
 .theme-fg-color1,
-.cm-s-mozilla .cm-number { /* original: green */
-  color: #008484;
+.cm-s-mozilla .cm-number,
+.variable-or-property .token-number,
+.variable-or-property[return] > .title > .name,
+.variable-or-property[scope] > .title > .name {
+  color: var(--theme-highlight-green);
+}
+
+.CodeMirror-Tern-completion-number:before {
+  background-color: #008484;
 }
 
 .theme-fg-color2,
@@ -96,42 +128,84 @@
 .cm-s-mozilla .cm-variable,
 .cm-s-mozilla .cm-def,
 .cm-s-mozilla .cm-property,
-.cm-s-mozilla .cm-qualifier { /* original: blue */
-  color: #9C9CFF;
+.cm-s-mozilla .cm-qualifier,
+.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 { /* original: pink/lavender */
-  color: #E7ADE7;
+.cm-s-mozilla .cm-header,
+.cm-s-mozilla .cm-bracket,
+.variables-view-property > .title > .name,
+.variable-or-property[safe-getter] > .title > .name {
+  color: var(--theme-highlight-pink);
+}
+
+.CodeMirror-Tern-completion-array:before {
+  color: var(--theme-highlight-pink); /* var(--theme-highlight-bluegrey) */
 }
 
-.theme-fg-color4 { /* original: purple/violet */
-  color: #C09070;
+.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 { /* original: Orange */
-  color: #E7ADE7;
+.cm-s-mozilla .cm-string-2,
+.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,
 .cm-s-mozilla .cm-atom,
 .cm-s-mozilla .cm-quote,
-.cm-s-mozilla .cm-error { /* original: Red */
-  color: #FF0000;
+.cm-s-mozilla .cm-error,
+.variable-or-property .token-boolean,
+.variable-or-property .token-domnode,
+.variable-or-property[exception] > .title > .name {
+  color: var(--theme-highlight-red);
+}
+
+.CodeMirror-Tern-completion-bool:before {
+  background-color: #FF0000;
+}
+
+.variable-or-property .token-domnode {
+  font-weight: bold;
 }
 
 .theme-toolbar,
-.devtools-toolbar { /* General toolbar styling */
+.devtools-toolbar,
+.devtools-sidebar-tabs > tabs,
+.CodeMirror-dialog { /* General toolbar styling */
+/*  color: var(--theme-body-color-alt);
+  background-color: var(--theme-toolbar-background);*/
 }
 
 
@@ -141,8 +215,14 @@
 
 .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,
+.variable-or-property:focus > .title {
+  background-color: #008484; /* fg-color2 */
+  color: #000000;
 }
 
 /* CodeMirror specific styles.
@@ -159,8 +239,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 {
@@ -210,12 +290,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 {
@@ -223,6 +303,50 @@ div.CodeMirror span.eval-text {
   min-height: 1.4em;
 }
 
+/* Twisty and checkbox controls */
+.theme-twisty, .theme-checkbox {
+  width: 14px;
+  height: 14px;
+  background-repeat: no-repeat;
+  background-image: url("chrome://browser/skin/devtools/controls.png");
+  background-size: 28px 28px;
+}
+
+.theme-twisty {
+  cursor: pointer;
+  background-position: -0px -14px;
+}
+
+.theme-twisty:-moz-focusring {
+  outline-style: none;
+}
+
+.theme-twisty[open] {
+  background-position: -14px -14px;
+}
+
+.theme-twisty[invisible] {
+  visibility: hidden;
+}
+
+.theme-checkbox {
+  display: inline-block;
+  border: 0;
+  padding: 0;
+  outline: none;
+  background-position: 0 0;
+}
+
+.theme-checkbox[checked] {
+  background-position: -14px 0;
+}
+
+@media (min-resolution: 2dppx) {
+  .theme-twisty, .theme-checkbox {
+    background-image: url("chrome://browser/skin/devtools/controls@2x.png");
+  }
+}
+
 /* XUL panel styling (see browser/devtools/shared/widgets/Tooltip.js) */
 
 .theme-tooltip-panel .panel-arrowcontent {
@@ -276,153 +400,253 @@ 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;
+  color: #E7ADE7;
+}
+
+.CodeMirror-Tern-fname {
+  color: #A09090;
+}
+
+.CodeMirror-hints,
+.CodeMirror-Tern-tooltip {
+  background-color: #000000;
+  color: var(--theme-body-color);
+}
+
 /* === BEGIN toolbars.inc.css === */
 
+/* Toolbars */
+.devtools-toolbar,
+.devtools-sidebar-tabs > tabs {
+}
+
 .devtools-toolbar {
 }
 
-/* LCARStrek checkbox colors don't work well against toolbar background */
-.devtools-toolbar > checkbox {
+.devtools-toolbar checkbox {
+  /* LCARStrek checkbox colors don't work well against toolbar background */
   background-color: #000000;
   padding: 2px;
 }
+.devtools-toolbar checkbox .checkbox-check {
+}
+.devtools-toolbar checkbox .checkbox-label-box {
+}
+.devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
+}
 
+/* Toolbar buttons */
 .devtools-menulist,
 .devtools-toolbarbutton {
+/*  transition: background 0.05s ease-in-out; */
 }
 
-devtools-menulist:-moz-focusring,
+.devtools-menulist:-moz-focusring,
 .devtools-toolbarbutton:-moz-focusring {
   outline: 1px dotted #008484;
 }
 
-.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 {
 }
 
-.devtools-toolbarbutton:not([checked=true]):hover:active {
+.devtools-toolbarbutton > .toolbarbutton-icon {
 }
 
-.devtools-menulist[open=true],
-.devtools-toolbarbutton[open=true],
-.devtools-toolbarbutton[checked=true] {
+.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-toolbarbutton[checked=true] {
+.devtools-menulist > .menulist-dropmarker {
+}
+
+.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
 }
 
-.devtools-toolbarbutton[checked=true]:hover:active {
+.devtools-menulist,
+.devtools-toolbarbutton {
+}
+
+/* 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 */
+}
+
+/* Button States */
+.devtools-toolbarbutton:hover,
+#toolbox-buttons .devtools-toolbarbutton[text-as-image]:hover,
+.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover {
+/*  background: rgba(0, 0, 0, .3); / Splitters */
+}
+
+.devtools-toolbarbutton:hover:active,
+#toolbox-buttons .devtools-toolbarbutton[text-as-image]:hover:active,
+.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]):hover:active {
+/*  background: rgba(0, 0, 0, .4); / Splitters */
+}
+
+/* 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: #f5f7fa;*/
+}
+
+.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: #f5f7fa; */
+}
+
+.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);
-}
-
-.devtools-menulist > .menulist-label-box {
-  text-align: center;
-}
-
-.devtools-menulist > .menulist-dropmarker {
+  list-style-image: url("chrome://browser/skin/devtools/tool-options.svg");
 }
 
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
+/* Toolbar button groups */
+.devtools-toolbarbutton-group > .devtools-toolbarbutton {
 }
 
-.devtools-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button {
+.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
 }
 
-.devtools-toolbarbutton[type=menu-button] {
-  padding: 0 1px;
-  -moz-box-align: stretch;
+.devtools-toolbarbutton-group + .devtools-toolbarbutton {
 }
 
-.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
-.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-box-align: center;
+.devtools-separator + .devtools-toolbarbutton {
 }
 
 /* Text input */
 
 .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;
+/*  margin-top: 1px;
+  margin-bottom: 1px;
+  padding: 0;*/
+  -moz-padding-start: 22px;
   -moz-padding-end: 12px;
+  background-position: 8px center;
+  background-size: 11px 11px;
+  background-repeat: no-repeat;
   font-size: inherit;
+
+  background-image: url("magnifying-glass.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .devtools-searchinput {
+    background-image: url("magnifying-glass@2x.png");
+  }
 }
 
 .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 */
 
 .devtools-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
   min-width: 16px;
   width: 16px;
 }
 
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
+.devtools-closebutton > image {
+  width: 16px;
+  height: 16px;
+  -moz-appearance: none;
+  background-size: 32px 16px;
+  background-image: url("chrome://browser/skin/devtools/close@2x.png");
+  background-position: 0 center;
+  background-repeat: no-repeat;
 }
 
-.devtools-closebutton:hover,
-.devtools-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+.devtools-closebutton:hover > image,
+.devtools-closebutton:hover:active > image {
+  background-position: -16px center;
+}
+
+.devtools-closebutton > .toolbarbutton-text {
+  display: none;
 }
 
 /* In-tools sidebar */
@@ -461,17 +685,7 @@ devtools-menulist:-moz-focusring,
   -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:-moz-locale-dir(rtl) > tabs > tab {
-}
-
-.devtools-sidebar-tabs > tabs > tab {
+.devtools-sidebar-tabs > tabs > tab:first-child {
 }
 
 .devtools-sidebar-tabs > tabs > tab:hover {
@@ -480,63 +694,51 @@ 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=true] + tab:hover {
-}
-
-.devtools-sidebar-tabs > tabs > tab[selected=true] + tab:hover:active {
+.devtools-sidebar-tabs > tabs > tab[selected] + tab {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected=true] {
+.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected=true]:hover {
+.devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active {
 }
 
-.devtools-sidebar-tabs > tabs > tab[selected=true]: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;
 /*  padding: 1px 3px; */
 }
 
-#toolbox-dock-bottom {
-  list-style-image: url("chrome://browser/skin/devtools/dock-bottom.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#toolbox-dock-buttons > toolbarbutton > image {
+  width: 16px;
+  height: 16px;
+  background-size: 32px 16px;
+  background-position: 0 center;
+  background-repeat: no-repeat;
 }
-
-#toolbox-dock-bottom:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+ 
+#toolbox-dock-buttons > toolbarbutton:hover > image {
+  background-position: -16px center;
 }
-
-#toolbox-dock-side {
-  list-style-image: url("chrome://browser/skin/devtools/dock-side.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#toolbox-dock-side:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+ 
+#toolbox-dock-bottom > image {
+  background-image: url("chrome://browser/skin/devtools/dock-bottom@2x.png");
 }
-
-#toolbox-dock-window {
-  list-style-image: url("chrome://browser/skin/devtools/undock.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+ 
+#toolbox-dock-side > image {
+  background-image: url("chrome://browser/skin/devtools/dock-side@2x.png");
 }
 
-#toolbox-dock-window:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#toolbox-dock-window > image {
+  background-image: url("chrome://browser/skin/devtools/undock@2x.png");
 }
 
 #toolbox-dock-window,
@@ -549,8 +751,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 */
@@ -565,67 +777,93 @@ devtools-menulist:-moz-focusring,
 .command-button:hover:active {
 }
 
-#command-button-paintflashing {
-  list-style-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+.command-button > image {
+  width: 16px;
+  height: 16px;
+  background-size: 32px 16px;
+  background-position: 0 center;
+  background-repeat: no-repeat;
 }
 
-#command-button-paintflashing:hover,
-#command-button-paintflashing:hover:active,
-#command-button-paintflashing[checked=true] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+.command-button:hover > image,
+.command-button:hover:active > image,
+.command-button[checked=true] > image,
+.command-button[open=true] > image {
+  background-position: -16px center;
 }
 
-#command-button-responsive {
-  list-style-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#command-button-paintflashing > image {
+  background-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
 }
 
-#command-button-responsive:hover,
-#command-button-responsive:hover:active,
-#command-button-responsive[checked=true] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#command-button-screenshot > image {
+  background-image: url("chrome://browser/skin/devtools/command-screenshot.png");
 }
 
-#command-button-tilt {
-  list-style-image: url("chrome://browser/skin/devtools/command-tilt.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#command-button-responsive > image {
+  background-image: url("chrome://browser/skin/devtools/command-responsivemode.png");
 }
 
-#command-button-tilt:hover,
-#command-button-tilt:hover:active,
-#command-button-tilt[checked=true] {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#command-button-tilt > image {
+  background-image: url("chrome://browser/skin/devtools/command-tilt.png");
 }
 
-#command-button-scratchpad {
-  list-style-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#command-button-scratchpad > image {
+  background-image: url("chrome://browser/skin/devtools/command-scratchpad.png");
 }
 
-#command-button-scratchpad:hover,
-#command-button-scratchpad:hover:active {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#command-button-pick > image {
+  background-image: url("chrome://browser/skin/devtools/command-pick.png");
 }
 
-#command-button-pick {
-  list-style-image: url("chrome://browser/skin/devtools/command-pick.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#command-button-frames > image {
+  background-image: url("chrome://browser/skin/devtools/command-frames.png");
 }
 
-#command-button-pick:hover,
-#command-button-pick:hover:active {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+#command-button-splitconsole > image {
+  background-image: url("chrome://browser/skin/devtools/command-console.png");
 }
 
-#command-button-splitconsole {
-  list-style-image: url("chrome://browser/skin/devtools/command-console.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+#command-button-eyedropper > image {
+  background-image: url("chrome://browser/skin/devtools/command-eyedropper.png");
 }
 
-#command-button-splitconsole:hover,
-#command-button-splitconsole:hover:active {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+@media (min-resolution: 2dppx) {
+  #command-button-paintflashing > image {
+    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");
+  }
+
+  #command-button-tilt > image {
+    background-image: url("chrome://browser/skin/devtools/command-tilt@2x.png");
+  }
+
+  #command-button-scratchpad > image {
+    background-image: url("chrome://browser/skin/devtools/command-scratchpad@2x.png");
+  }
+
+  #command-button-pick > image {
+    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");
+  }
+
+  #command-button-eyedropper > image {
+    background-image: url("chrome://browser/skin/devtools/command-eyedropper@2x.png");
+  }
 }
 
 /* Tabs */
@@ -634,7 +872,8 @@ devtools-menulist:-moz-focusring,
 }
 
 #toolbox-tabs {
-  margin: 0;
+  margin: 0 2px;
+  -moz-padding-start: 3px;
   background-color: #000000;
   color: #FFCF00;
 }
@@ -658,15 +897,11 @@ devtools-menulist:-moz-focusring,
   width: 16px; /* Prevents collapse during theme switching */
 }
 
-#toolbox-tab-options > image {
-/*  margin: 0 8px; */
-}
-
 .devtools-tab:hover > image {
 }
 
 .devtools-tab:active > image,
-.devtools-tab[selected=true] > image {
+.devtools-tab[selected] > image {
 }
 
 .devtools-tab:hover,
@@ -675,7 +910,7 @@ devtools-menulist:-moz-focusring,
   color: #000000;
 }
 
-.devtools-tab[selected=true] {
+.devtools-tab[selected] {
   background-color: #008484;
   color: #000000;
 }
@@ -690,6 +925,11 @@ devtools-menulist:-moz-focusring,
   -moz-margin-start: 0;
 }
 
+#toolbox-option-container {
+  background-color: #000000;
+  -moz-padding-start: 3px;
+}
+
 #toolbox-tab-options {
   min-width: 20px;
 }
@@ -698,22 +938,36 @@ 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;
 }
 
+/* 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;