X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fdevtools%2Ftoolbars.css;h=c46b93b55766be8adeb5af1022c1b5ac92e6e638;hp=db5a2c9c6fe499ce6634ee83491e7caa14f9e710;hb=1e9e1791d430ae539727c01da67e7dbbf3adfa18;hpb=dadba0f24ba2459f70e098788b20b0e4ba96a7d2

diff --git a/LCARStrek/devtools/toolbars.css b/LCARStrek/devtools/toolbars.css
index db5a2c9c..c46b93b5 100644
--- a/LCARStrek/devtools/toolbars.css
+++ b/LCARStrek/devtools/toolbars.css
@@ -5,11 +5,23 @@
 
 /* CSS Variables specific to the devtools toolbar that aren't defined by the themes */
 .theme-light,
-.theme-dark {
+.theme-dark,
+.theme-firebug {
+  --toolbar-tab-hover: #FFCF00;
+  --toolbar-tab-hover-active: #FF9F00;
   --searchbox-background-color: #000000;
   --searchbox-border-color: #9C9CFF;
   --searcbox-no-match-background-color: #400000;
   --searcbox-no-match-border-color: #FF0000;
+  --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);
+  --toolbar-button-border-color: #A09090;
 
   /* Toolbox buttons */
   --command-paintflashing-image: url(images/command-paintflashing.svg);
@@ -25,12 +37,17 @@
   --command-measure-image: url(images/command-measure.svg);
 }
 
+#toolbox-container {
+ padding-top: 3px;
+}
+
 /* Toolbars */
 .devtools-toolbar,
 .devtools-sidebar-tabs tabs {
 }
 
 .devtools-toolbar {
+  border-bottom: 3px solid var(--theme-body-background);
 }
 
 .devtools-toolbar checkbox {
@@ -51,7 +68,6 @@
 .devtools-menulist,
 .devtools-toolbarbutton,
 .devtools-button {
-/*  transition: background 0.05s ease-in-out; */
 }
 
 .devtools-menulist,
@@ -59,7 +75,8 @@
 }
 
 .devtools-menulist:-moz-focusring,
-.devtools-toolbarbutton:-moz-focusring {
+.devtools-toolbarbutton:-moz-focusring,
+.devtools-button:-moz-focusring {
   outline: 1px dotted var(--theme-selection-color);
 }
 
@@ -74,7 +91,11 @@
 .devtools-button {
   margin: 0;
   padding: 0;
-  min-width: 32px;
+  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 */
@@ -117,17 +138,41 @@
   border: none;
 /*  min-height: 32px; */
   background-color: var(--theme-button-background);
+  color: var(--theme-button-color);
+  border-radius: 300px;
 }
 
-.devtools-toolbarbutton[standalone] {
+.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: 20px;
+  min-width: 16px;
 }
 
 #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
@@ -136,9 +181,6 @@
   min-width: inherit;
 }
 
-#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;
 }
@@ -193,15 +235,58 @@
 /*  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-toolbarbutton:not([label])[checked=true] > image,
-.devtools-toolbarbutton:not([label])[open=true] > image {
+.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 */
 }
@@ -238,15 +323,20 @@
   color: var(--theme-selection-color); */
 }
 
-.devtools-toolbarbutton[checked=true]:hover {
+:root {
+  --clear-icon-url: url("chrome://devtools/skin/images/clear.svg");
 }
 
-.devtools-option-toolbarbutton {
-  list-style-image: url("chrome://devtools/skin/images/tool-options-tbutton.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);
 }
 
-/* Toolbar button groups */
-.devtools-toolbarbutton-group > .devtools-toolbarbutton {
+.devtools-option-toolbarbutton {
+  list-style-image: var(--tool-options-image);
 }
 
 .devtools-toolbarbutton-group > .devtools-toolbarbutton:last-child {
@@ -258,29 +348,19 @@
 .devtools-separator + .devtools-toolbarbutton {
 }
 
-: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);
-}
-
 /* Text input */
 
 .devtools-textinput,
+.devtools-filterinput,
 .devtools-searchinput {
 /*  -moz-appearance: none;
-  margin: 0 3px;
-  border: 1px solid rgb(88, 94, 101);
+  margin: 1 3px;
+  border: 1px solid;
   border-radius: 2px;
-  background-color: rgba(24, 29, 32, 1);
   padding: 4px 6px;
-  color: rgba(184, 200, 217, 1);*/
+  border-color: var(--theme-splitter-color);*/
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 :root[platform="mac"] .devtools-textinput,
@@ -288,19 +368,17 @@
 /*  border-radius: 20px;*/
 }
 
-
 .devtools-searchinput {
 /*  margin-top: 1px;
   margin-bottom: 1px;
   padding: 0;*/
   -moz-padding-start: 22px;
   -moz-padding-end: 4px;
+  background-image: var(--magnifying-glass-image);
   background-position: 8px center;
   background-size: 11px 11px;
   background-repeat: no-repeat;
   font-size: inherit;
-
-  background-image: url("magnifying-glass.png");
 }
 
 .devtools-searchinput:-moz-locale-dir(rtl),
@@ -319,6 +397,24 @@
   position: relative;
 }
 
+/* The spacing is accomplished with a padding on the searchbox */
+.devtools-searchbox > .devtools-textinput,
+.devtools-searchbox > .devtools-searchinput {
+}
+
+/* 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 {
+}
+.devtools-toolbar > .devtools-textinput:last-child,
+.devtools-toolbar > .devtools-searchinput:last-child {
+}
+.devtools-toolbar > .devtools-searchbox:first-child {
+}
+.devtools-toolbar > .devtools-searchbox:last-child {
+}
+
 .devtools-rule-searchbox {
   -moz-box-flex: 1;
   width: 100%;
@@ -359,11 +455,11 @@
 }
 
 .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/search-clear.svg");
+  background-image: url("chrome://devtools/skin/images/search-clear.svg");
 }
 
 .devtools-style-searchbox-no-match + .devtools-searchinput-clear {
-  background-image: url("chrome://devtools/skin/search-clear-failed.svg") !important;
+  background-image: url("chrome://devtools/skin/images/search-clear-failed.svg") !important;
 }
 
 .devtools-searchinput-clear:hover {
@@ -371,18 +467,15 @@
 }
 
 .devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
-  list-style-image: url("chrome://devtools/skin/search-clear.svg");
+  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:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
+.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear {
 }
 
-@media (min-resolution: 1.1dppx) {
-  .devtools-searchinput {
-    background-image: url("magnifying-glass@2x.png");
-  }
+.devtools-searchinput > .textbox-input-box > .textbox-search-icons > .textbox-search-clear:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 /* Close button */
@@ -392,32 +485,35 @@
   width: 16px;
 }
 
+#toolbox-close::before,
 .devtools-closebutton > image {
   width: 16px;
   height: 16px;
   -moz-appearance: none;
-  background-size: 32px 16px;
-  background-image: url("chrome://devtools/skin/close@2x.png");
-  background-position: 0 center;
+  background-size: cover;
+  background-image: var(--close-button-image);
+  background-position: center center;
   background-repeat: no-repeat;
 }
 
-.devtools-closebutton:hover > image,
-.devtools-closebutton:hover:active > image {
-  background-position: -16px center;
+button#toolbox-close {
+  margin-inline-start: 2px;
+  margin-inline-end: 10px;
 }
 
-.devtools-closebutton > .toolbarbutton-text {
-  display: none;
+.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 */
 }
 
-#toolbox-close::before {
-  background-image: url("chrome://devtools/skin/close@2x.png");
+.devtools-closebutton > .toolbarbutton-text {
+  display: none;
 }
 
 /* In-tools sidebar */
 
-.devtools-sidebar-tabs {
+div.devtools-sidebar-tabs {
+  height: 100%;
 }
 
 .devtools-sidebar-tabs > tabpanels {
@@ -431,7 +527,8 @@
 }
 
 .devtools-sidebar-alltabs {
-/*  height: 24px;
+/*  -moz-appearance: none;
+  height: 24px;
   line-height: 24px;
   padding: 0 4px;
   margin: 0;
@@ -485,12 +582,6 @@
 .devtools-sidebar-tabs tabs > tab:hover:active {
 }
 
-.devtools-sidebar-tabs tabs > tab[selected] + tab:hover {
-}
-
-.devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active {
-}
-
 .devtools-sidebar-tabs tabs > tab[selected],
 .devtools-sidebar-tabs tabs > tab[selected]:hover:active {
 }
@@ -501,35 +592,32 @@
 
 #toolbox-controls > toolbarbutton,
 #toolbox-dock-buttons > toolbarbutton {
+ -moz-user-focus: normal;
   min-width: 16px;
-/*  padding: 1px 3px; */
+  width: 16px;
 }
 
 #toolbox-dock-buttons > toolbarbutton > image {
   width: 16px;
   height: 16px;
-  background-size: 32px 16px;
+  background-size: 16px 16px;
   background-position: 0 center;
   background-repeat: no-repeat;
 }
  
-#toolbox-dock-buttons > toolbarbutton:hover > image {
-  background-position: -16px center;
-}
- 
 #toolbox-dock-bottom::before,
 #toolbox-dock-bottom > image {
-  background-image: url("chrome://devtools/skin/dock-bottom@2x.png");
+  background-image: var(--dock-bottom-image);
 }
  
 #toolbox-dock-side::before,
 #toolbox-dock-side > image {
-  background-image: url("chrome://devtools/skin/dock-side@2x.png");
+  background-image: var(--dock-side-image);
 }
 
 #toolbox-dock-window::before,
 #toolbox-dock-window > image {
-  background-image: url("chrome://devtools/skin/undock@2x.png");
+  background-image: var(--dock-undock-image);
 }
 
 #toolbox-dock-bottom-minimize {
@@ -539,11 +627,11 @@
 }
 
 #toolbox-dock-bottom-minimize > image {
-  background-image: url("chrome://devtools/skin/dock-bottom-minimize@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-bottom-minimize@2x.png");
 }
 
 #toolbox-dock-bottom-minimize.minimized > image {
-  background-image: url("chrome://devtools/skin/dock-bottom-maximize@2x.png");
+  background-image: url("chrome://devtools/skin/images/dock-bottom-maximize@2x.png");
 }
 
 #toolbox-dock-window,
@@ -573,16 +661,22 @@
 
 /* Command buttons */
 
+.toolbox-dock-button,
 .command-button {
   -moz-appearance: none;
   border: none;
-/*  padding: 0 8px; */
-/*  margin: 0; */
-  width: 16px;
+  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); */
 }
@@ -605,20 +699,7 @@
   background-repeat: no-repeat;
 }
 
-#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,
-.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);
-}
+/* Toolbox buttons images */
 
 #command-button-paintflashing > image,
 #command-button-paintflashing::before {
@@ -645,6 +726,11 @@
   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);
@@ -670,11 +756,6 @@
   background-image: var(--command-measure-image);
 }
 
-#command-button-frames > image,
-#command-button-frames::before {
-  background-image: var(--command-frames-image);
-}
-
 /* Tabs */
 
 .devtools-tabbar {
@@ -694,14 +775,13 @@
   visibility: collapse;
 }
 
-#toolbox-deck[selectedIndex] > .toolbox-panel, /* workaround for Firefox 47 and older */
 .toolbox-panel[selected] {
   visibility: visible;
 }
 
 .devtools-tab {
   min-width: 32px;
-  max-width: 110px;
+  max-width: 100px;
   color: #000000;
   margin: 0;
   -moz-margin-end: 3px;
@@ -712,12 +792,17 @@
 }
 
 .devtools-tab > image {
-  -moz-margin-end: 0px;
-/*  -moz-margin-start: 4px; */
+  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 {
 }
 
@@ -810,6 +895,12 @@
 /*  -moz-border-end: 1px solid var(--theme-splitter-color);
   border-color: var(--theme-splitter-color); / Needed for responsive container at low width. */
 }
+
+.devtools-invisible-splitter {
+  border-color: transparent;
+  background-color: transparent;
+}
+
 /* Throbbers */
 
 .devtools-throbber::before {