X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fdevtools%2Ftoolbars.css;h=cf3e8d9ca3e5aefeb57503c5b5d1058e24b54ee2;hp=a7dfad96924df149e382f697c5f355ddb44b8738;hb=b1d1a8bbaca0a31b2c2581911368b6892d447718;hpb=dae4507500ac2bc6547a8303851bc9b0bcae5ddf

diff --git a/LCARStrek/devtools/toolbars.css b/LCARStrek/devtools/toolbars.css
index a7dfad96..cf3e8d9c 100644
--- a/LCARStrek/devtools/toolbars.css
+++ b/LCARStrek/devtools/toolbars.css
@@ -16,34 +16,25 @@
   --magnifying-glass-image: url(images/search.svg);
   --filter-image: url(images/filter.svg);
   --tool-options-image: url(images/tool-options-tbutton.svg);
-  --close-button-image: url(chrome://devtools/skin/images/close.svg);
   --icon-filter: invert(1);
-  --dock-bottom-image: url(chrome://devtools/skin/images/dock-bottom.svg);
-  --dock-side-image: url(chrome://devtools/skin/images/dock-side.svg);
-  --dock-undock-image: url(chrome://devtools/skin/images/dock-undock.svg);
+  --checked-icon-filter: url(images/filters.svg#checked-icon-state);
   --toolbar-button-border-color: #A09090;
-
-  /* Toolbox buttons */
-  --command-paintflashing-image: url(images/command-paintflashing.svg);
-  --command-screenshot-image: url(images/command-screenshot.svg);
-  --command-responsive-image: url(images/command-responsivemode.svg);
-  --command-scratchpad-image: url(images/command-scratchpad.svg);
-  --command-pick-image: url(images/command-pick.svg);
-  --command-frames-image: url(images/command-frames.svg);
-  --command-splitconsole-image: url(images/command-console.svg);
-  --command-noautohide-image: url(images/command-noautohide.svg);
-  --command-eyedropper-image: url(images/command-eyedropper.svg);
-  --command-rulers-image: url(images/command-rulers.svg);
-  --command-measure-image: url(images/command-measure.svg);
-}
-
-#toolbox-container {
- padding-top: 3px;
 }
 
 /* Toolbars */
 .devtools-toolbar,
 .devtools-sidebar-tabs tabs {
+  padding: 0;
+  border-width: 0;
+/*  border-bottom-width: 1px;*/
+  border-style: solid;
+/*  height: 24px;
+  line-height: 24px;*/
+  box-sizing: border-box;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+}
+.devtools-toolbar {
+  height: 24px;
 }
 
 .devtools-toolbar {
@@ -63,456 +54,122 @@
 .devtools-toolbar checkbox .checkbox-label-box .checkbox-label {
 }
 
-/* Toolbar buttons */
-
-.devtools-menulist,
-.devtools-toolbarbutton,
-.devtools-button {
-}
-
-.devtools-menulist,
-.devtools-toolbarbutton {
-}
-
-.devtools-menulist:-moz-focusring,
-.devtools-toolbarbutton:-moz-focusring,
-.devtools-button:-moz-focusring {
-  outline: 1px dotted var(--theme-selection-color);
-}
-
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-icon,
-.devtools-button::before {
-  width: 16px;
-  height: 16px;
-/*  transition: opacity 0.05s ease-in-out;*/
-}
-
-/* HTML buttons */
-.devtools-button {
-  margin: 0;
-  padding: 0;
-  border: none;
-  border-radius: 3px;
-  min-width: 16px;
-  height: 100%;
-  margin-inline-start: 2px;
-  background: var(--theme-toolbar-background);
-  color: var(--theme-body-color);
-  /* The icon is absolutely positioned in the button using ::before */
-  position: relative;
-}
-
-.devtools-button:not([disabled]):hover {
-  background: var(--theme-hover-background);
-  color: var(--theme-hover-color);
-}
-
-.devtools-button:not([disabled]):hover:active {
-  background: var(--theme-active-background);
-  color: var(--theme-active-color);
-}
-
-/* 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;
+/* HTML Checkboxes - a lot copied from global/in-content/common.css */
+/* Hide the actual checkbox */
+input[type="checkbox"] {
+  opacity: 0;
+  width: 0;
+  pointer-events: none;
   position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -8px 0 0 -8px;
-  background-size: cover;
-  background-repeat: no-repeat;
-/*  transition: opacity 0.05s ease-in-out;*/
-}
-
-/* Standalone buttons */
-.devtools-button[standalone],
-.devtools-button[data-standalone],
-.devtools-toolbarbutton[standalone],
-.devtools-toolbarbutton[data-standalone] {
-  border: none;
-/*  min-height: 32px; */
-  background-color: var(--theme-button-background);
-  color: var(--theme-button-color);
-  border-radius: 300px;
-}
-
-.devtools-button[standalone]:hover,
-.devtools-button[data-standalone]:hover,
-.devtools-toolbarbutton[standalone]:hover,
-.devtools-toolbarbutton[data-standalone]:hover {
-  background-color: var(--theme-hover-background);
-  color: var(--theme-hover-color);
 }
 
-.devtools-button[standalone]:hover:active,
-.devtools-button[data-standalone]:hover:active,
-.devtools-toolbarbutton[standalone]:hover:active,
-.devtools-toolbarbutton[data-standalone]:hover:active {
-  background-color: var(--theme-active-background);
-  color: var(--theme-active-color);
-}
-
-.devtools-toolbarbutton[standalone], .devtools-toolbarbutton[data-standalone] {
-}
-
-.devtools-toolbarbutton[label][standalone] {
-}
-
-.devtools-menulist,
-.devtools-toolbarbutton,
-.devtools-button {
-}
-
-/* Icon button styles */
-.devtools-toolbarbutton:not([label]),
-.devtools-toolbarbutton[text-as-image] {
-  min-width: 16px;
-}
-
-#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-  padding-inline-start: 5px;
-  padding-inline-end: 5px;
-  min-width: inherit;
+label > input[type="checkbox"] { /* old placement of checkbox in label, undo above */
+  opacity: 1;
+  width: auto;
+  pointer-events: auto;
+  position: static;
 }
 
-#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
-  padding: 0 2px;
+/* Create a box to style as the checkbox */
+input[type="checkbox"] + label::before {
+  display: inline-block;
+  content: "";
+  vertical-align: middle;
 }
 
-.devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
-  display: none;
+.devtools-searchbox + #browser-style-checkbox-label, /* workaround for old placement of checkbox in label */
+input[type="checkbox"] + label {
+  line-height: 0px;
+  color: var(--theme-capped-toolbar-text);
 }
 
-.devtools-toolbar .devtools-toolbarbutton {
+input[type="checkbox"] + label::before {
+  -moz-appearance: none;
+  width: 13px;
+  height: 13px;
+  border-radius: 0;
+  border: 1px solid var(--theme-body-color);
+  margin-inline-end: 3px;
   margin-inline-start: 2px;
-}
-
-.devtools-toolbarbutton > .toolbarbutton-icon {
-}
-
-/* Menu button styles (eg. web console filters) */
-.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 {
-}
-
-/* Icon-only buttons */
-.devtools-button:empty::before,
-.devtools-toolbarbutton:not([label]):not([disabled]) > image {
-/*  opacity: 0.8;*/
-}
-
-.devtools-button:hover:empty::before,
-.devtools-button[checked]:empty::before,
-.devtools-button[open]:empty::before,
-.devtools-toolbarbutton:not([label]):hover > image,
-.devtools-toolbarbutton:not([label])[checked=true] > image,
-.devtools-toolbarbutton:not([label])[open=true] > image {
-/*  opacity: 1;*/
-}
-
-.devtools-button:disabled,
-.devtools-button[disabled],
-.devtools-toolbarbutton[disabled] {
-/*  opacity: 0.5 !important;*/
-}
-
-.devtools-button[standalone]::before,
-.devtools-button[data-standalone]::before,
-.devtools-toolbarbutton[standalone]::before,
-.devtools-toolbarbutton[data-standalone]::before,
-.devtools-button:not([disabled]):hover::before,
-.devtools-button:not([disabled]):hover:active::before,
-.devtools-button[checked]:empty::before,
-.devtools-button[open]:empty::before,
-.devtools-button[standalone] > image,
-.devtools-button[data-standalone] > image,
-.devtools-toolbarbutton[standalone] > image,
-.devtools-toolbarbutton[data-standalone] > image,
-.devtools-toolbarbutton:not([disabled]):hover > image,
-.devtools-toolbarbutton:not([disabled]):hover:active > image,
-.devtools-toolbarbutton[checked=true] > image,
-.devtools-toolbarbutton[open=true] > image {
-  filter: url(images/filters.svg#checked-icon-state);
-}
-
-#toolbox-close:hover::before,
-#toolbox-close:hover:active::before,
-.toolbox-dock-button:hover::before,
-.toolbox-dock-button:hover:active::before,
-.command-button:hover::before,
-.command-button:hover:active::before,
-.command-button[checked=true]::before,
-.command-button[open=true]::before,
-#toolbox-close:hover > image,
-#toolbox-close:hover:active > image,
-.toolbox-dock-button:hover > image,
-.toolbox-dock-button:hover:active > image,
-.command-button:hover > image,
-.command-button:hover:active > image,
-.command-button[checked=true] > image,
-.command-button[open=true] > image {
-  filter: url(images/filters.svg#checked-icon-state);
-}
-
-.devtools-button[disabled]::before,
-.devtools-toolbarbutton[disabled] > image {
-  filter: url(images/filters.svg#disabled-icon-state);
-}
-
-/* Icon-and-text buttons */
-.devtools-toolbarbutton.icon-and-text .toolbarbutton-text {
-  margin-inline-start: .5em !important;
-  font-weight: 600;
-}
-
-/* Text-only buttons */
-.devtools-toolbarbutton[label]:not([text-as-image]):not([type=menu-button]),
-.devtools-toolbarbutton[data-text-only],
-#toolbox-buttons .devtools-toolbarbutton[text-as-image] {
-/*  background-color: rgba(0, 0, 0, .2); / Splitter */
-}
-
-/* Text-only button states */
-.devtools-button:not(:empty):not([disabled]):hover,
-#toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover,
-.devtools-toolbarbutton:not(:-moz-any([checked=true],[disabled],[text-as-image]))[label]:hover {
-/*  background: rgba(0, 0, 0, .3); / Splitters */
-}
-
-.devtools-button:not(:empty):not([disabled]):hover:active,
-#toolbox-buttons .devtools-toolbarbutton:not([disabled])[text-as-image]:hover:active,
-.devtools-toolbarbutton:not(:-moz-any([checked=true],[disabled],[text-as-image]))[label]:hover:active {
-/*  background: rgba(0, 0, 0, .4); / Splitters */
-}
-
-.devtools-toolbarbutton:not([disabled])[label][checked=true],
-.devtools-toolbarbutton:not([disabled])[label][open],
-.devtools-button:not(:empty)[checked=true],
-#toolbox-buttons .devtools-toolbarbutton[text-as-image][checked=true] {
-/*  background: rgba(29, 79, 115, .7); / Select highlight blue /
-  color: var(--theme-selection-color); */
-}
-
-.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); */
-}
-
-:root {
-  --clear-icon-url: url("chrome://devtools/skin/images/clear.svg");
-}
-
-.devtools-button.devtools-clear-icon::before {
-  background-image: var(--clear-icon-url);
-}
-
-.devtools-toolbarbutton.devtools-clear-icon {
-  list-style-image: var(--clear-icon-url);
-}
-
-.devtools-option-toolbarbutton {
-  list-style-image: var(--tool-options-image);
-}
-
-.devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
-}
-
-.devtools-toolbarbutton-group + .devtools-toolbarbutton {
-}
-
-.devtools-separator + .devtools-toolbarbutton {
-}
-
-/* Text input */
-
-.devtools-textinput,
-.devtools-filterinput,
-.devtools-searchinput {
-/*  -moz-appearance: none;
-  margin: 1 3px;
-  border: 1px solid;
-  border-radius: 2px;
-  padding: 4px 6px;
-  border-color: var(--theme-splitter-color);*/
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-:root[platform="mac"] .devtools-textinput,
-:root[platform="mac"] .devtools-searchinput {
-/*  border-radius: 20px;*/
-}
-
-.devtools-searchinput {
-/*  margin-top: 1px;
-  margin-bottom: 1px;
-  padding: 0;*/
-  padding-inline-start: 22px;
-  padding-inline-end: 4px;
-  background-image: var(--magnifying-glass-image);
-  background-position: 8px center;
-  background-size: 11px 11px;
+  background-color: var(--theme-toolbar-background);
+  background-position: center center;
   background-repeat: no-repeat;
-  font-size: inherit;
-}
-
-.devtools-searchinput:-moz-locale-dir(rtl),
-.devtools-searchinput:dir(rtl) {
-  background-position: calc(100% - 8px) center;
 }
 
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-icon {
-  visibility: hidden;
+input[type="checkbox"]:not(:disabled) + label:hover::before {
+  border-color: var(--theme-hover-background);
 }
-
-/* Searchbox is a div container element for a search input element */
-.devtools-searchbox {
-  display: flex;
-  flex: 1;
-  position: relative;
+.devtools-searchbox + #browser-style-checkbox-label:hover, /* workaround for old placement of checkbox in label */
+input[type="checkbox"]:not(:disabled) + label:hover {
+  color: var(--theme-hover-background);
 }
-
-/* The spacing is accomplished with a padding on the searchbox */
-.devtools-searchbox > .devtools-textinput,
-.devtools-searchbox > .devtools-searchinput {
+input[type="checkbox"]:checked + label::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check");
 }
 
-/* Don't add 'double spacing' for inputs that are at beginning / end
-   of a toolbar (since the toolbar has it's own spacing). */
-.devtools-toolbar > .devtools-textinput:first-child,
-.devtools-toolbar > .devtools-searchinput:first-child {
+input[type="checkbox"]:checked:disabled + label::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check-disabled");
 }
-.devtools-toolbar > .devtools-textinput:last-child,
-.devtools-toolbar > .devtools-searchinput:last-child {
+input[type="checkbox"]:checked:not(:disabled) + label:hover::before {
+  background-image: url("chrome://global/skin/in-content/check.svg#check-hover");
 }
-.devtools-toolbar > .devtools-searchbox:first-child {
+input[type="checkbox"]:disabled + label::before {
+  border-color: var(--theme-body-color-inactive);
 }
-.devtools-toolbar > .devtools-searchbox:last-child {
+input[type="checkbox"]:disabled + label {
+  color: var(--theme-body-color-inactive);
 }
 
-.devtools-rule-searchbox {
-  -moz-box-flex: 1;
-  width: 100%;
-  font: inherit;
-}
-
-.devtools-rule-searchbox[filled] {
-  background-color: var(--searchbox-background-color);
-  border-color: var(--searchbox-border-color);
-  padding-inline-end: 23px;
-}
-
-.devtools-style-searchbox-no-match {
-  background-color: var(--searcbox-no-match-background-color) !important;
-  border-color: var(--searcbox-no-match-border-color) !important;
-}
-
-.devtools-no-search-result {
-  border-color: var(--theme-highlight-red) !important;
-}
-
-.devtools-searchinput-clear {
-  position: absolute;
-  top: 3.5px;
-  right: 7px;
-  padding: 0;
-  border: 0;
-  width: 16px;
-  height: 16px;
-  background-position: 0 0;
+.devtools-separator {
+  margin: 0 2px;
+  width: 2px;
+  background-image: linear-gradient(transparent 15%, var(--theme-splitter-color) 15%, var(--theme-splitter-color) 85%, transparent 85%);
+  background-size: 1px 100%;
   background-repeat: no-repeat;
-  background-color: transparent;
-}
-
-.devtools-searchinput-clear:dir(rtl) {
-  right: unset;
-  left: 7px;
-}
-
-.devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/images/search-clear.svg");
-}
-
-.devtools-style-searchbox-no-match + .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/images/search-clear-failed.svg") !important;
+  background-position: 0, 1px, 2px;
 }
 
-.devtools-searchinput-clear:hover {
-  background-position: -16px 0;
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://devtools/skin/images/search-clear.svg");
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-}
+/* HTML toolbars - style them LCARStrek-like */
 
-.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-/* Close button */
-
-.devtools-closebutton {
-  min-width: 16px;
-  width: 16px;
-}
-
-#toolbox-close::before,
-.devtools-closebutton > image {
-  width: 16px;
-  height: 16px;
-  -moz-appearance: none;
-  background-size: cover;
-  background-image: var(--close-button-image);
-  background-position: center center;
+div.devtools-toolbar,
+div.devtools-tabbar {
+  background-size: calc(100% - 30px);
+  background-image: linear-gradient(90deg, var(--theme-capped-toolbar-background), var(--theme-capped-toolbar-background));
   background-repeat: no-repeat;
+  background-position: center center;
+  display: flex;
 }
 
-button#toolbox-close {
-  margin-inline-start: 2px;
-  margin-inline-end: 10px;
+div.devtools-toolbar::before,
+div.devtools-toolbar::after,
+div.devtools-tabbar::before,
+div.devtools-tabbar::after {
+  display: flex;
+  content: "";
+  width: 12px;
+  min-height: 16px;
+  background-color: var(--theme-toolbar-caps);
 }
 
-.devtools-closebutton > .toolbarbutton-icon {
-  /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must
-     use evil CSS to give the impression of smaller content */
+div.devtools-toolbar::before,
+div.devtools-tabbar::before {
+  border-radius: 8px 0px 0px 8px;
+  border: none;
+  border-inline-end: 3px solid black;
+  margin-inline-end: 2px;
 }
 
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
+div.devtools-toolbar::after,
+div.devtools-tabbar::after {
+  border-radius: 0px 8px 8px 0px;
+  border: none;
+  border-inline-start: 3px solid black;
+  margin-inline-start: auto; /* originally 2px, but auto makes us able to get flexible free space */
 }
 
 /* In-tools sidebar */
 
-div.devtools-sidebar-tabs {
+.devtools-sidebar-tabs {
   height: 100%;
 }
 
@@ -586,341 +243,41 @@ div.devtools-sidebar-tabs {
 .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 > toolbarbutton,
-#toolbox-dock-buttons > toolbarbutton {
- -moz-user-focus: normal;
-  min-width: 16px;
-  width: 16px;
-}
-
-#toolbox-dock-buttons > toolbarbutton > image {
-  width: 16px;
-  height: 16px;
-  background-size: 16px 16px;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
- 
-#toolbox-dock-bottom::before,
-#toolbox-dock-bottom > image {
-  background-image: var(--dock-bottom-image);
-}
- 
-#toolbox-dock-side::before,
-#toolbox-dock-side > image {
-  background-image: var(--dock-side-image);
-}
-
-#toolbox-dock-window::before,
-#toolbox-dock-window > image {
-  background-image: var(--dock-undock-image);
-}
-
-#toolbox-dock-bottom-minimize {
-  /* Bug 1177463 - The minimize button is currently hidden until we agree on
-     the UI for it, and until bug 1173849 is fixed too. */
+.hidden-labels-box:not(.visible) > label,
+.hidden-labels-box.visible ~ .hidden-labels-box > label:last-child {
   display: none;
 }
 
-#toolbox-dock-bottom-minimize > image {
-  background-image: url("chrome://devtools/skin/images/dock-bottom-minimize@2x.png");
-}
-
-#toolbox-dock-bottom-minimize.minimized > image {
-  background-image: url("chrome://devtools/skin/images/dock-bottom-maximize@2x.png");
-}
-
-#toolbox-dock-window,
-#toolbox-dock-bottom,
-#toolbox-dock-side {
-}
-
-#toolbox-dock-window:hover,
-#toolbox-dock-bottom:hover,
-#toolbox-dock-side:hover {
-}
-
-.devtools-separator {
-  margin: 0 2px;
-  width: 2px;
-}
-
-#toolbox-buttons:empty + .devtools-separator,
-.devtools-separator[invisible] {
-  visibility: hidden;
-}
-
-#toolbox-controls-separator {
-  margin: 0;
-  width: 1px;
-}
-
-/* Command buttons */
-
-.toolbox-dock-button,
-.command-button {
-  -moz-appearance: none;
-  border: none;
-  margin-inline-start: 2px;
-  width: 20px;
-  height: 100%;
-  position: relative;
-  -moz-user-focus: normal;
-}
-
-button.toolbox-dock-button,
-button.command-button {
-  padding: 8px;
-}
-
-.command-button:hover {
-/*  background-color: var(--toolbar-tab-hover); */
-}
-.command-button:hover:active, .command-button[checked=true]:not(:hover) {
-/*  background-color: var(--toolbar-tab-hover-active) */
-}
-
-#command-button-frames {
-  width: 32px;
-}
-
-#toolbox-close::before,
-.toolbox-dock-button::before,
-.command-button::before,
-.command-button > image {
-  width: 16px;
-  height: 16px;
-  background-size: cover;
-  background-position: 0 center;
-  background-repeat: no-repeat;
-}
-
-/* Toolbox buttons images */
-
-#command-button-paintflashing > image,
-#command-button-paintflashing::before {
-  background-image: var(--command-paintflashing-image);
-}
-
-#command-button-screenshot > image,
-#command-button-screenshot::before {
-  background-image: var(--command-screenshot-image);
-}
-
-#command-button-responsive > image,
-#command-button-responsive::before {
-  background-image: var(--command-responsive-image);
-}
-
-#command-button-scratchpad > image,
-#command-button-scratchpad::before {
-  background-image: var(--command-scratchpad-image);
-}
-
-#command-button-pick > image,
-#command-button-pick::before {
-  background-image: var(--command-pick-image);
-}
-
-#command-button-frames > image,
-#command-button-frames::before {
-  background-image: var(--command-frames-image);
-}
-
-#command-button-splitconsole > image,
-#command-button-splitconsole::before {
-  background-image: var(--command-splitconsole-image);
-}
-
-#command-button-noautohide > image,
-#command-button-noautohide::before {
-  background-image: var(--command-noautohide-image);
-}
-
-#command-button-eyedropper > image,
-#command-button-eyedropper::before {
-  background-image: var(--command-eyedropper-image);
-}
-
-#command-button-rulers > image,
-#command-button-rulers::before {
-  background-image: var(--command-rulers-image);
-}
-
-#command-button-measure > image,
-#command-button-measure::before {
-  background-image: var(--command-measure-image);
-}
-
-/* Tabs */
-
-.devtools-tabbar {
-}
-
-#toolbox-tabs {
-  padding-inline-start: 3px;
-  margin-inline-start: 2px; /* this is only needed for the old button design */
-  margin-inline-end: 3px; /* this is for the new ::before-based button design */
-  background-color: #000000;
-  color: #FFCF00;
-}
-
-.toolbox-panel {
-  display: -moz-box;
-  -moz-box-flex: 1;
-  visibility: collapse;
+.devtools-invisible-splitter {
+  border-color: transparent;
+  background-color: transparent;
 }
 
-.toolbox-panel[selected] {
-  visibility: visible;
+.devtools-horizontal-splitter,
+.devtools-side-splitter {
+/*  background-color: var(--theme-splitter-color);*/
 }
 
-.devtools-tab {
-  min-width: 32px;
-  max-width: 100px;
-  color: #000000;
+/* HACK around hardcoded stylings for the HTML-based sidebar tabs */
+.tabs .tabs-menu-item,
+.theme-dark .tabs .tabs-menu-item,
+.theme-light .tabs .tabs-menu-item {
   margin: 0;
-  margin-inline-end: 3px;
-  padding: 1px;
-  padding-inline-start: 3px;
-  background-color: #C09070;
+  margin-inline-end: 3px !important;
+  padding: 0 !important;
   border-radius: 8px 8px 0 0;
+  border: 0 !important;
+  background-color: var(--theme-button-background);
 }
-
-.devtools-tab > image {
-  margin: 0;
-/*  margin-inline-start: 4px; */
-  max-height: 16px;
-  width: 16px; /* Prevents collapse during theme switching */
-}
-
-.devtools-tab > label {
-  white-space: nowrap;
-/*  margin: 0 4px;*/
-}
-
-.devtools-tab:hover > image {
-}
-
-.devtools-tab:active > image,
-.devtools-tab[selected] > image {
-}
-
-.devtools-tab:hover,
-.devtools-tab:hover:active {
-  background-color: var(--theme-hover-background);
-  color: var(--theme-hover-color);
-}
-
-.devtools-tab[selected] {
-  background-color: var(--theme-selection-background);
-  color: var(--theme-selection-color);
-}
-
-.devtools-tab > spacer {
-  max-width: 0;
-  -moz-box-flex: 0;
-}
-
-.devtools-tab > image {
-  margin-inline-end: 0;
-  margin-inline-start: 0;
-}
-
-#toolbox-picker-container {
-  margin-inline-start: 1px;
-}
-
-#toolbox-option-container {
-  background-color: #000000;
-  padding-inline-start: 3px;
-  margin-inline-end: 1px;
-}
-
-#toolbox-tab-options {
-  min-width: 20px;
-}
-
-#toolbox-tab-options > image {
-  margin-inline-end: 3px;
-}
-
-.devtools-tab:not([highlighted]) > .highlighted-icon,
-.devtools-tab[selected] > .highlighted-icon,
-.devtools-tab:not([selected])[highlighted] > .default-icon {
-  visibility: collapse;
-}
-
-.devtools-tab:not([selected])[highlighted] {
-}
-
-.devtools-tab:not([selected])[highlighted] {
-  color: #FFCF00;
-}
-
-.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;
-  padding-inline-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 {
-/*  border-inline-end: 1px solid var(--theme-splitter-color);
-  border-color: var(--theme-splitter-color); / Needed for responsive container at low width. */
+.tabs .tabs-menu-item a {
+  color: var(--theme-button-color) !important;
+  padding: 0px 3px !important;
 }
-
-.devtools-invisible-splitter {
-  border-color: transparent;
-  background-color: transparent;
+.tabs .tabs-menu-item.is-active {
+  height: auto !important;
 }
-
-/* Throbbers */
-
-.devtools-throbber::before {
-  content: "";
-  display: inline-block;
-  vertical-align: bottom;
-  margin-inline-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);
-  }
+.tabs .tabs-navigation {
+  height: auto !important;
+  border: 0 !important;
+  border-bottom: 3px solid  var(--theme-body-background) !important;
 }