GUI changes: more distinct on/off modules, various CSS and GUI tweaks for further future modifications

Collection of CSS and GUI improvements, cleanup of main CSS theme, introduction of highlight for enabled module. 

Primary change is the modification of the module titles to better distinguish modules that are on or off. The text of a disabled module is now less bright, the corresponding icon is a slightly smaller version of the power icon. When activating the module, the text turns brighter and the icon slightly bigger and also brighter. Thanks to @TechXavAL for the icon work.

Secondary changes are related to the margins around several GUI elements, padding within elements and some accompanying borders. These changes hopefully make it easier to distinguish the various (sometimes crowded) GUI elements of modules. The panels have gotten a slightly 'outset' look.

Nested panels have a changed look where deeper nesting increases the background brightness slightly, instead of darkening it (old behaviour). This  is done without a strong decrease in contrast.

The old theme is available as a legacy option. Due to hardcoded GUI changes needed for the new theme, the legacy version is not a 100% exact replicate. The @TooWaBoo theme's may also be slightly affected.
This commit is contained in:
Thanatomanic
2020-12-27 15:31:39 +01:00
committed by GitHub
parent 94f54b6443
commit d2cd5f21c9
23 changed files with 2684 additions and 305 deletions

View File

@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -17,7 +15,7 @@
inkscape:export-filename="/tmp/template.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 2405546, 2018-03-11"
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="power-off-small.svg">
<sodipodi:namedview
id="base"
@@ -26,16 +24,16 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="50.625"
inkscape:cx="8"
inkscape:cy="8"
inkscape:zoom="48.806956"
inkscape:cx="7.6926668"
inkscape:cy="8.0255665"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-width="3440"
inkscape:window-height="1387"
inkscape:window-x="3832"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:grid-bbox="true"
inkscape:pagecheckerboard="false"
@@ -44,7 +42,8 @@
inkscape:snap-others="false"
inkscape:object-nodes="false"
inkscape:snap-grids="true"
inkscape:snap-bbox-midpoints="false">
inkscape:snap-bbox-midpoints="false"
inkscape:document-rotation="0">
<inkscape:grid
type="xygrid"
id="grid1374"
@@ -63,7 +62,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Maciej Dworak</dc:title>
@@ -100,11 +99,15 @@
inkscape:groupmode="layer"
inkscape:label="Layer 1"
transform="translate(0,-8)">
<circle
style="opacity:0.5;fill:none;fill-opacity:0.75294118;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50047243;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
id="path2547"
cx="8"
cy="17"
r="3.2497637" />
<path
style="display:inline;opacity:0.5;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 11.030908,13.501206 a 4.3252046,4.3407218 0 0 1 1.294297,3.096681 v 0 A 4.3252046,4.3407218 0 0 1 8,20.938608 4.3252046,4.3407218 0 0 1 3.6747954,16.597887 4.3252046,4.3407218 0 0 1 4.9720116,13.498331"
id="path5608"
inkscape:connector-curvature="0" />
<path
style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2.6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 7.9999995,11.259782 v 3.39629"
id="path2553"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -17,8 +15,8 @@
inkscape:export-filename="/tmp/template.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="power-on.svg">
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
sodipodi:docname="power-on-small.svg">
<sodipodi:namedview
id="base"
pagecolor="#E0E1E2"
@@ -26,16 +24,16 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="50.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:zoom="32"
inkscape:cx="10.989922"
inkscape:cy="9.722799"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-width="3440"
inkscape:window-height="1387"
inkscape:window-x="3832"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:grid-bbox="true"
inkscape:pagecheckerboard="false"
@@ -44,14 +42,18 @@
inkscape:snap-others="false"
inkscape:object-nodes="false"
inkscape:snap-grids="true"
inkscape:snap-bbox-midpoints="false">
inkscape:snap-bbox-midpoints="false"
inkscape:document-rotation="0"
inkscape:snap-global="false">
<inkscape:grid
type="xygrid"
id="grid1374"
originx="1"
originy="1"
empspacing="7"
dotted="false" />
dotted="false"
visible="true"
enabled="true" />
</sodipodi:namedview>
<defs
id="defs815" />
@@ -63,7 +65,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<dc:creator>
<cc:Agent>
<dc:title>Maciej Dworak</dc:title>
@@ -97,18 +99,36 @@
</metadata>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1"
transform="translate(0,-8)">
transform="translate(0,-8)"
inkscape:groupmode="layer">
<path
style="opacity:1;fill:none;fill-opacity:0.75294118;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="M 11.503774,13.432989 A 5,5 0 0 1 13,17 v 0 A 5,5 0 0 1 8,22 5,5 0 0 1 3,17 5,5 0 0 1 4.499601,13.429677"
id="path5608"
inkscape:connector-curvature="0" />
style="display:none;opacity:0.75;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="M 11.503774,13.128228 A 5,5 0 0 1 13,16.695239 v 0 a 5,5 0 0 1 -5,5 5,5 0 0 1 -5,-5 5,5 0 0 1 1.499601,-3.570323"
id="path5608-3"
inkscape:connector-curvature="0"
inkscape:label="bottom round glow" />
<path
style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
style="display:none;opacity:0.75;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:3.9;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 7.9999994,10.551133 v 3.912126"
id="path2553"
inkscape:connector-curvature="0" />
id="path2553-6"
inkscape:connector-curvature="0"
inkscape:label="bottom straight glow" />
<path
id="path839"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.266667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
d="M 8.0000002,9.2447604 A 1.2218936,1.2217828 0 0 0 6.77751,10.46714 v 3.846109 a 1.2218936,1.2217828 0 0 0 1.2224902,1.22238 1.2218936,1.2217828 0 0 0 1.22249,-1.22238 V 10.46714 A 1.2218936,1.2217828 0 0 0 8.0000002,9.2447604 Z M 4.5455258,11.780796 A 1.2218936,1.2217828 0 0 0 3.6971212,12.128 c -1.1790295,1.153783 -1.8435795,2.735852 -1.8435795,4.384817 -4e-7,3.376499 2.7671706,6.136953 6.1464585,6.136953 3.3792878,0 6.1464588,-2.760454 6.1464578,-6.136953 0,-1.646953 -0.663499,-3.22596 -1.839998,-4.379448 a 1.2218936,1.2217828 0 0 0 -1.727238,0.01611 1.2218936,1.2217828 0 0 0 0.01611,1.72887 c 0.709034,0.695164 1.107938,1.643337 1.107938,2.63447 0,2.05355 -1.642357,3.693983 -3.7032678,3.693983 -2.0609116,0 -3.7032683,-1.640433 -3.7032681,-3.693983 0,-0.992346 0.399166,-1.942703 1.1097276,-2.638049 a 1.2218936,1.2217828 0 0 0 0.019688,-1.72708 1.2218936,1.2217828 0 0 0 -0.8806222,-0.366892 z" />
<path
style="display:none;opacity:0.1;fill:none;fill-opacity:0.752941;fill-rule:nonzero;stroke:#1f90e0;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="M 11.503774,13.13695 A 5,5 0 0 1 13,16.703961 v 0 a 5,5 0 0 1 -5,5 5,5 0 0 1 -5,-5 5,5 0 0 1 1.499601,-3.570323"
id="path5608-36"
inkscape:connector-curvature="0"
inkscape:label="blue glow round" />
<path
style="display:none;opacity:0.05;fill:none;fill-rule:evenodd;stroke:#1f90e0;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
d="m 7.9999994,10.551133 v 3.912126"
id="path2553-7"
inkscape:connector-curvature="0"
inkscape:label="blue glow straight" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1,9 +1,8 @@
/*
This file is part of RawTherapee.
Copyright (c) 2015-2017 DrSlony
Copyright (c) 2016-2019 Hombre
Copyright (c) 2016-2019 TooWaBoo
Copyright (c) 2015-2020 RawTherapee
Contributions by DrSlony, Hombre, TooWaBoo, Thanatomanic
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,26 +19,24 @@
*/
/***************************/
/**/ @import "size.css"; /**/
/**/ @import "size.css"; /**/ /* TODO: Remove this weird dependency */
/***************************/
/* text-shadow causes a serious performance degradation in rendering the UI,
* at least in comboboxes with many entries (i.e. Profiled Lens Correction).
*/
/** Set style defaults **/
* {
color: #AAAAAA;
text-shadow: none;
color: #BBBBBB;
text-shadow: none; /* Keep at none, or suffer serious performance issues */
font-size: 1em;
}
*:disabled {
color: #666666;
opacity: 0.7;
color: rgba(255,255,255,0.25);
opacity: 0.8;
}
.view:selected:not(check):not(radio) {
color: #262626;
background-color: #AAAAAA
background-color: #AAAAAA;
}
/* The Places and Dir browser panels */
@@ -53,7 +50,6 @@ textview.view, treeview.view {
/* The headers of these panels */
.view .button {
background-color: #363636;
/*padding: 0.1666666666666666em;*/
}
window > box {
@@ -64,17 +60,15 @@ window.background {
}
/*** Window decoration *********************************************************/
@define-color winHeaderbar rgb(50,50,50);
.csd:not(.popup):not(tooltip) > decoration {
background-color: #484848;
background-image: none;
box-shadow: 0 0.25em 0.75em 0.083333333333333333em rgba(0, 0, 0, 0.5), 0 0 0 0.083333333333333333em #242424;
}
headerbar {
background-color: shade(@winHeaderbar,1.12);
background-color: shade(rgb(50,50,50),1.12);
box-shadow: inset 0 0.083333333333333333em rgba(200,200,200,.13);
background-image: linear-gradient(shade(@winHeaderbar,1.14), shade(@winHeaderbar,.86));
background-image: linear-gradient(shade(rgb(50,50,50),1.14), shade(rgb(50,50,50),.86));
border-bottom-color: #242424;
}
dialog > box {
@@ -90,7 +84,6 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
.maximized > headerbar {
border-radius: 0;
}
/**/
/*** End Window decoration *****************************************************/
@@ -128,33 +121,20 @@ label {
/* Affects all frames except in the toolbox */
frame {
border-width: 0;
border-color: #303030;
border-radius: 0;
border-style: solid;
/*border-style: none none none solid;*/
padding: 0;
margin: 0;
background-color: rgba(0,0,0,0.);
min-height: 0;
min-width: 0;
margin-bottom: 0.75em;
}
/* Create space between frame contents and frame border */
frame border {
border-width: 0.083333333333333333em;
padding: 0.3333333333333333em;
border: 1px solid #262626;
border-radius: 0.3333333333333333em;
background-color: #383838;
margin: 0;
min-height: 0;
min-width: 0;
padding: 0.083333333333333333em;
}
frame > label {
margin: 0 0 0 0.3333333333333333em;
color: #D8D8D8;
padding: 0.416666666666666666em 0;
padding: 0.416666666666666666em 0.25em;
}
/* affects selection list*/
@@ -199,7 +179,7 @@ popover separator:not(:only-child) {
paned.horizontal > separator {
margin: 0 0.16666666666666666em;
}
/* Double line separator */
paned.vertical > separator {
margin: 0.25em 0;
}
@@ -419,19 +399,19 @@ button.flat {
}
button.flat:checked {
background-image: linear-gradient(#343434, #2E2E2E, #292929);
background-image: linear-gradient(#545454, #4E4E34, #494949);
}
checkbutton > check {
background-image: linear-gradient(#343434, #2E2E2E, #292929);
background-image: linear-gradient(#545454, #4E4E4E, #494949);
}
radiobutton > radio {
background-image: linear-gradient(#343434, #2E2E2E, #292929);
background-image: linear-gradient(#545454, #4E4E4E, #494949);
}
button.flat:hover, checkbutton:hover > check, radiobutton:hover > radio {
background-image: linear-gradient(shade(#343434,1.3), shade(#2E2E2E,1.3), shade(#292929,1.3));
background-image: linear-gradient(shade(#545454,1.3), shade(#4E4E4E,1.3), shade(#494949,1.3));
}
button.popupbutton-arrow {
@@ -476,10 +456,10 @@ scale slider {
padding: 0.583333333333333333em;
border-radius: 1.166666666666666666em;
border-width: 0.083333333333333333em;
background-image: linear-gradient(#343434, #2E2E2E, #292929);
background-image: linear-gradient(#444444, #3E3E3E, #393939);
}
scale slider:hover {
background-image: linear-gradient(#444444, #3E3E3E, #393939);
background-image: linear-gradient(#545454, #4E4E4E, #494949);
}
scale:disabled slider {
background-image: none;
@@ -493,7 +473,7 @@ scale trough {
padding: 0 0.583333333333333333em;
border-width: 0.083333333333333333em;
border-radius: 0.333333333333333333em;
background-color: #2A2A2A;
background-color: rgba(0,0,0,0.15);
}
scale:disabled trough {
background-color: #444;
@@ -574,7 +554,7 @@ button.text-button.toggle:hover:checked {
.drawingarea:selected {
background-color: #565656;
border-radius: 0.8333333333333333em;
border-radius: 1.8333333333333333em;
}
image {
@@ -631,7 +611,7 @@ button.Right {
/* [1.23[-][+]] */
entry, spinbutton {
min-height: 0.8333333333333333em;
background-color: #262626;
background-color: rgba(0,0,0,0.075);
border-radius: 0.2em;
}
@@ -752,149 +732,118 @@ button.radio#histButton:hover {
/*** end ***************************************************************************************/
/*** Modules ***********************************************************************************/
#EditorModules > box {
margin: 0;
padding: 0;
}
#MyExpander {
margin: 0;
padding: 0;
}
#MyExpander.withScrollbar {
margin-right: 0.25em;
#MyExpander.withScrollbar { /* This margin is always added */
margin-right: 1em;
}
#MyExpander.withScrollbar #MyExpander { /* No margin for nested expanders */
margin-right: 0;
}
/* Borders around tools and subtools */
#MyExpander {
border-top: 0.0833333333333333em solid rgba(0,0,0,0.3);
}
#MyExpander:first-child {
border-top: none;
}
#MyExpander:nth-last-child(2),
#MyExpander #MyExpander:nth-last-child(1) {
border-bottom: 0.0833333333333333em solid rgba(0,0,0,0.3);
}
#MyExpander #MyExpander:nth-last-child(2) {
border-bottom: none;
}
/* Tool background */
#ExpanderBox > box, #ExpanderBox > grid {
background-color: #363636;
border-width: 0.0833333333333333em;
border-style: solid;
border-radius: 0.3333333333333333em;
border-color: #252525;
margin: 0;
padding: 0.25em;
#ExpanderBox > box,
#ExpanderBox > grid {
background-color: rgba(255,255,255,0.075);
padding: 0.3em 0.5em 0.6em 0.5em;
border-top: 0.0833333333333333em solid rgba(255,255,255,0.1);
border-bottom: none;
}
#ExpanderBox drawingarea {
background-color: #363636;
/* Not all combinations below are used, but this makes sure
also some of the more exotic box and frame layouts are
treated properly. */
#ExpanderBox frame > box,
#ExpanderBox frame frame > box,
#ExpanderBox2 frame > box,
#ExpanderBox2 frame frame > box,
#ExpanderBox3 frame > box,
#ExpanderBox3 frame frame > box,
#ExpanderBox frame > grid,
#ExpanderBox frame frame > grid,
#ExpanderBox2 frame > grid,
#ExpanderBox2 frame frame > grid,
#ExpanderBox3 frame > grid,
#ExpanderBox3 frame frame > grid {
padding: 0 0.5em 0.5em 0.5em;
}
#LocallabToolPanel frame,
#ExpanderBox frame,
#ExpanderBox2 frame,
#ExpanderBox3 frame {
padding: 0.1666666666666666em 0 0 0;
border-style: none;
}
#ExpanderBox frame > border {
background-color: #3B3B3B;
border-style: solid;
border-width: 0.0833333333333333em;
border-radius: 0.3333333333333333em;
border-color: #313131;
margin: 0.25em;
padding: 0.25em;
}
#LocallabToolPanel frame > label, #LocallabToolPanel frame frame > label,
#ExpanderBox frame > label, #ExpanderBox frame frame > label,
#ExpanderBox2 frame > label, #ExpanderBox2 frame frame > label,
#ExpanderBox3 frame > label, #ExpanderBox3 frame frame > label {
margin-left: 7pt;
margin-top: 0;
}
#LocallabToolPanel frame > box, #LocallabToolPanel frame frame > box, #LocallabToolPanel frame > grid, #LocallabToolPanel frame frame > grid,
#ExpanderBox frame > box, #ExpanderBox frame frame > box, #ExpanderBox frame > grid, #ExpanderBox frame frame > grid,
#ExpanderBox2 frame > box, #ExpanderBox2 frame frame > box, #ExpanderBox2 frame > grid, #ExpanderBox2 frame frame > grid,
#ExpanderBox3 frame > box, #ExpanderBox3 frame frame > box, #ExpanderBox3 frame > grid, #ExpanderBox3 frame frame > grid {
margin: 0.1666666666666666em;
}
#LocallabToolPanel > box > checkbutton, #LocallabToolPanel > box > box, #LocallabToolPanel > grid > checkbutton, #LocallabToolPanel > box > grid, #LocallabToolPanel > grid > grid, #LocallabToolPanel frame > box > grid, #LocallabToolPanel frame > grid > grid, #LocallabToolPanel frame > grid > box,
#ExpanderBox > box > checkbutton, #ExpanderBox > box > box, #ExpanderBox > grid > checkbutton, #ExpanderBox > box > grid, #ExpanderBox > grid > grid, #ExpanderBox frame > box > grid, #ExpanderBox frame > grid > grid, #ExpanderBox frame > grid > box,
#ExpanderBox2 > box > checkbutton, #ExpanderBox2 > box > box, #ExpanderBox2 > grid > checkbutton, #ExpanderBox2 > box > grid, #ExpanderBox2 > grid > grid, #ExpanderBox2 frame > box > grid, #ExpanderBox2 frame > grid > grid, #ExpanderBox2 frame > grid > box,
#ExpanderBox3 > box > checkbutton, #ExpanderBox3 > box > box, #ExpanderBox3 > grid > checkbutton, #ExpanderBox3 > box > grid, #ExpanderBox3 > grid > grid, #ExpanderBox3 frame > box > grid, #ExpanderBox3 frame > grid > grid, #ExpanderBox3 frame > grid > box {
margin-top: 0.1666666666666666em;
}
#ExpanderBox frame drawingarea {
background-color: #3B3B3B;
}
#ExpanderBox frame frame > border {
background-color: #414141;
border: 0.0833333333333333em solid #373737;
border-radius: 0.3333333333333333em;
margin: 0.25em;
padding: 0.25em;
}
#ExpanderBox frame frame drawingarea {
background-color: #414141;
/* Necessary hack for extra margin in Wavelets and some other locations */
#ExpanderBox box > box,
#ExpanderBox2 box > box {
margin: 0.16666666666666em 0;
}
/* Sub-tool (MyExpander) background */
#LocallabToolPanel > box, #LocallabToolPanel > grid,
#ExpanderBox2 > box, #ExpanderBox2 > grid {
background-color: #3B3B3B;
border: 0.0833333333333333em solid #2A2A2A;
border-radius: 0.3333333333333333em;
#LocallabToolPanel > box,
#LocallabToolPanel > grid,
#ExpanderBox2 > box,
#ExpanderBox2 > grid {
background-color: rgba(255,255,255,0.075);
margin: 0;
padding: 0.25em;
}
#LocallabToolPanel drawingarea,
#ExpanderBox2 drawingarea {
background-color: #3B3B3B;
}
#LocallabToolPanel frame > border,
#ExpanderBox2 frame > border {
background-color: #414141;
border: 0.0833333333333333em solid #373737;
border-radius: 0.3333333333333333em;
margin: 0.25em;
padding: 0.25em;
}
#LocallabToolPanel frame drawingarea,
#ExpanderBox2 frame drawingarea {
background-color: #414141;
}
#LocallabToolPanel frame frame > border,
#ExpanderBox2 frame frame > border {
background-color: #474747;
border: 0.0833333333333333em solid #3D3D3D;
border-radius: 0.3333333333333333em;
margin: 0.25em;
padding: 0.25em;
}
#LocallabToolPanel frame frame drawingarea,
#ExpanderBox2 frame frame drawingarea {
background-color: #474747;
}
#MyExpanderTitle > box {
margin: 0.1666666666666666em 0;
padding: 0.1666666666666666em 0;
padding: 0.25em 0.5em 0.5em 0.25em;
border-top: 0.0833333333333333em solid rgba(255,255,255,0.1);
border-bottom: none;
}
#MyExpanderTitle label {
color: #CCCCCC;
color: #AAAAAA;
padding: 0;
margin: 0 0.25em 0 0.25em;
font-size: 1.1em;
margin: 0;
font-size: 1.1em; /* TODO: Does not work? */
font-weight: bold;
}
#MyExpander.Fold > #MyExpanderTitle label,
#MyExpander.OnOff.enabledTool > #MyExpanderTitle label {
color: #DDDDDD;
}
#MyExpanderTitle:hover {
background-color: #202020;
}
#MyExpanderTitle eventbox:hover image {
background-color: #202020;
border-radius: 0.25em;
margin: 0;
padding: 0;
}
#MyExpanderTitle:hover label {
color: #D8D8D8;
}
/* Alignment of tool headers is controlled by the image */
#MyExpander.Fold > #MyExpanderTitle box > image,
#MyExpander.OnOff > #MyExpanderTitle #MyExpanderStatus image {
padding: 0.3em;
margin: 0.25em 0.25em 0.25em 0;
}
#LocallabToolPanel separator, #ExpanderBox2 separator, #ExpanderBox3 separator {
color: #292929;
}
@@ -903,6 +852,7 @@ button.radio#histButton:hover {
#MainNotebook grid label, #MainNotebook grid image {
padding: 0.0833333333333333em;
}
/*** end ***************************************************************************************/
/* File Browser right side tabs - Toolbox, Inspector, Fast Export, Filter */
notebook {
@@ -918,7 +868,7 @@ notebook header {
border-style: none;
border-color: #262626;
border-radius: 0;
padding: 0.1666666666666666em;
padding: 0;
margin: 0;
}
@@ -962,14 +912,12 @@ notebook header.left {
}
notebook.frame {
/* OK */
border-radius: 0;
border-style: none;
}
/* Pad notebooks, makes the other borders look nicer */
notebook stack {
/* OK */
background-color: #484848;
padding: 0;
margin: 0;
@@ -982,12 +930,14 @@ paned box, paned grid {
}
paned > separator {
border-width: 0.0833333333333333em 0.0833333333333333em 0 0;
border-style: solid;
border-color: #404040;
background: rgba(0,0,0,0.075);
border: none;
min-width: 0.25em;
min-height: 0.25em;
padding: 0;
margin: 0.3333333333333333em;
margin: 0;
}
fontchooser scrolledwindow,
#PlacesPaned scrolledwindow,
#HistoryPanel scrolledwindow,
@@ -1021,21 +971,17 @@ fontchooser scrolledwindow,
}
#MainNotebook header {
/* OK */
background-color: #2A2A2A;
border: 0;
padding: 0;
}
#MainNotebook tabs {
/* OK */
background-color: #2A2A2A;
}
#MainNotebook tab:hover {
/* OK */
background-color: #505050;
}
#MainNotebook tab:active {
/* OK */
border-color: #989898;
}
#MainNotebook tab:checked {
@@ -1047,18 +993,16 @@ fontchooser scrolledwindow,
}
#RightNotebook > stack > scrolledwindow frame,
#BatchQueueButtonsMainContainer frame,
#MyExpander frame,
dialog frame {
margin: 0;
padding: 0.19em 0.583333333333333333em;
padding: 0;
}
#RightNotebook > stack > scrolledwindow frame > border,
#BatchQueueButtonsMainContainer > frame > border,
#MyExpander frame > border,
dialog frame > border {
padding: 0 0.333333333333333333em 0.333333333333333333em;
padding: 0;
border-width: 0.083333333333333333em;
margin: 0 -0.583333333333333333em;
margin: 0;
}
#RightNotebook > stack > scrolledwindow frame > label:not(.dummy),
#BatchQueueButtonsMainContainer frame > label:not(.dummy),
@@ -1098,21 +1042,18 @@ dialog frame > label:not(.dummy) {
min-width: 25em;
}
#ToolPanelNotebook header {
background-color: #383838;
border-color: #262626;
padding: 0;
margin: 0;
#ToolPanelNotebook viewport {
padding: 0;
}
#ToolPanelNotebook header tabs {
padding: 0.0833333333333333em;
background-color: #2A2A2A;
margin: 0;
}
#ToolPanelNotebook header tab {
padding: 0.25em;
margin: 0;
padding: 0.3333333333333333em;
}
/* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
@@ -1234,44 +1175,31 @@ dialog frame > label:not(.dummy) {
margin: 0;
}
#RightNotebook #HistoryPanel {
min-width: 17.5em;
margin-top: 0.333333333333333333em;
}
#RightNotebook scrolledwindow {
padding: 0;
}
#HistoryPanel {
margin-top: 0.25em;
}
#HistoryPanel > border {
margin-top: 1.75em;
}
#HistoryPanel > label {
margin: 0 0 -1.5em 0;
padding: 0 0 0 0.083333333333333333em;
}
#Snapshots {
margin-top: 0.166666666666666666em;
}
#Snapshots > border {
min-height: calc(6em + 36px);
#Navigator border,
#HistoryPanel border,
#Snapshots border {
border: none;
}
#Navigator > label,
#HistoryPanel > label,
#Snapshots > label {
margin-bottom: -4px;
margin: 0;
padding: 0 0 0.25em 0;
}
#Snapshots scrolledwindow + box {
margin: -8px 0 -4px ;
margin: -8px 0 -4px;
border-top-width: 0.083333333333333333em;
}
#Navigator {
padding-top: 0.25em;
padding-bottom: 0.25em;
}
#Navigator label {
#Navigator box label {
margin: 0;
padding: 0;
margin: 0.083333333333333333em 0;
}
/*** PartialPaste ******************************************************************************/

View File

@@ -318,12 +318,12 @@ fontchooser scrolledwindow,
/*** end ***************************************************************************************/
/*** Navigator *********************************************************************************/
#Navigator {
#Navigator box {
padding-top: 0.75em;
padding-bottom: 0.25em;
background-color: @bg-dark-grey;
}
#Navigator label {
#Navigator box label {
padding: 0;
margin: 0.083333333333333333em 0 0;
}
@@ -1223,6 +1223,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
color: @headline-big;
padding: 0;
margin: 0.083333333333333333em 0.25em 0 0.166666666666666666em;
font-weight: bold;
}
#MyExpanderTitle:hover label {

File diff suppressed because it is too large Load Diff

View File

@@ -313,38 +313,6 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
margin: 0.083333333333333333em 0 0.166666666666666666em 0;
}
#ToolPanelNotebook > stack > scrolledwindow > viewport.frame {
padding: 0 0.25em;
}
#MyExpander {
margin: 0;
padding: 0;
}
#ExpanderBox > box, #ExpanderBox > grid {
border-width: 0.083333333333333333em;
border-radius: 0.416666666666666666em;
margin: 0;
padding: 0.5em 0.333333333333333333em;
}
/* Sub-tool (MyExpander) */
#ExpanderBox2 > box, #ExpanderBox2 > grid {
border-width: 0.083333333333333333em;
border-radius: 0.416666666666666666em;
margin: 0 0.19em;
padding: 0.333333333333333333em;
}
#MyExpanderTitle > box {
margin: 0;
padding: 0.25em 0;
}
#MyExpanderTitle label {
padding: 0;
margin: 0.083333333333333333em 0.25em 0 0.166666666666666666em;
}
/*** end ***************************************************************************************/
/*** Context & popups menus *****************************************************************************/
@@ -366,8 +334,8 @@ menu > arrow.top:hover,
menu > arrow.bottom,
menu > arrow.bottom:hover {
border: none;
padding: 0.5em;
min-height: 1.5em;
padding: 0.25em;
min-height: 1em;
}
menuitem {