From bf3b706b8a350ab4ff10750519817e9825487f01 Mon Sep 17 00:00:00 2001 From: Eudaimon Date: Sat, 24 Sep 2022 19:25:00 +0200 Subject: [PATCH] attempted to make all controls a bit smaller. GTK4 seems reluctant, though, and I don't know why. --- gtk-3.0/gtk.css | 38 +++++++++++----------- gtk-4.0/gtk.css | 44 +++++++++++++------------- source/common/_theme_colors.scss | 2 +- source/common/checkradios.scss | 11 ++++--- source/common/common_common.scss | 8 ++--- source/gtk3/gtk-new.css | 38 +++++++++++----------- source/gtk4/_common.scss | 20 ++++++------ source/gtk4/gtk-new.css | 44 +++++++++++++------------- source/templates/colorscheme-Simple.sh | 2 +- 9 files changed, 106 insertions(+), 101 deletions(-) diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 20c7362..ec6c0f6 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -100,7 +100,7 @@ spinner:checked:disabled { opacity: 0.5; color: #7c675a; } .caption { font-weight: 400; font-size: 9pt; } /**************** Text Entries * */ -spinbutton:not(.vertical), entry { min-height: 28px; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; } +spinbutton:not(.vertical), entry { min-height: 1.6em; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; } spinbutton:not(.vertical) image.left, entry image.left { margin-right: 6px; } @@ -168,7 +168,7 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #669900; } @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#f57900), to(transparent)); } to { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#669900), to(transparent)); } } -button.titlebutton, scrollbar slider, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, calendar.button, button { min-height: 24px; min-width: 16px; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } +button.titlebutton, scrollbar slider, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, calendar.button, button { min-height: 1.6em; min-width: 1.6em; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } button.sidebar-button, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, scrollbar slider.flat:not(:hover):not(:active):not(:checked):not(:disabled), notebook > header > tabs > arrow.flat:not(:hover):not(:active):not(:checked):not(:disabled), calendar.flat.button:not(:hover):not(:active):not(:checked):not(:disabled), button.flat:not(:hover):not(:active):not(:checked):not(:disabled) { border-width: 2px; border-color: transparent; background-color: transparent; background-image: none; text-shadow: none; -gtk-icon-shadow: none; transition: none; } @@ -458,7 +458,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; background-color: #313030; } /*************** Header bars * */ -.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 40px; border: none; border-radius: 0px; background-color: #669900; color: #d1ff96; border: none; /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ } +.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 2.5em; border: none; border-radius: 0px; background-color: #507800; color: #d1ff96; border: none; /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ } .titlebar:backdrop:not(headerbar), headerbar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -868,9 +868,9 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; } -check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #5a6659 20%, #4e584d 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check, radio { background-clip: padding-box; background-image: image(#4e584d); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #4e584d; color: #d1ff96; } -check:hover, radio:hover { background-image: linear-gradient(to bottom, #647062 10%, #586357 90%); } +check:hover, radio:hover { background-image: image(#5f6b5e); } check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#424a41); } @@ -880,9 +880,9 @@ check:backdrop, radio:backdrop { background-image: image(#4e584d); box-shadow: n check:backdrop:disabled, radio:backdrop:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:checked, radio:checked { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:checked, radio:checked { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:checked:hover, radio:checked:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:checked:hover, radio:checked:hover { background-image: image(#7ebd00); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -892,9 +892,9 @@ check:checked:backdrop, radio:checked:backdrop { background-image: image(#669900 check:checked:backdrop:disabled, radio:checked:backdrop:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:indeterminate:hover, radio:indeterminate:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:indeterminate:hover, radio:indeterminate:hover { background-image: image(#7ebd00); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -1322,7 +1322,7 @@ colorchooser .popover.osd { border-radius: 5px; } .scale-popup button:hover { background-color: rgba(237, 240, 245, 0.1); } /********************** Window Decorations * */ -decoration { border-radius: 0px 0px 0 0; box-shadow: 0 0 0 4px #88cc00, 2px 2px 0 2px #4e7500; margin: 8px; } +decoration { border-radius: 0px 0px 0 0; box-shadow: 0 0 0 4px #72ab00, 2px 2px 0 2px #385400; margin: 8px; } decoration:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } @@ -1332,31 +1332,31 @@ decoration:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } tooltip.csd decoration { border-radius: 0px; box-shadow: none; } -button.titlebutton.close { border-width: 2px; color: #d1ff96; background-color: #994d00; border-left-color: #e67400; border-top-color: #e67400; border-right-color: #663300; border-bottom-color: #663300; } +button.titlebutton.close { border-width: 2px; color: #d1ff96; background-color: #8e3c00; border-left-color: #db5c00; border-top-color: #db5c00; border-right-color: #5b2600; border-bottom-color: #5b2600; } -button.titlebutton.close:hover, button.titlebutton.close:hover:backdrop { border-width: 2px; background-color: #b35a00; border-left-color: #ff8000; border-top-color: #ff8000; border-right-color: #804000; border-bottom-color: #804000; } +button.titlebutton.close:hover, button.titlebutton.close:hover:backdrop { border-width: 2px; background-color: #a84700; border-left-color: #f46700; border-top-color: #f46700; border-right-color: #753100; border-bottom-color: #753100; } -button.titlebutton.close:active, button.titlebutton.close:active:backdrop { border-width: 2px; background-color: #994d00; border-left-color: #663300; border-top-color: #663300; border-right-color: #e67400; border-bottom-color: #e67400; } +button.titlebutton.close:active, button.titlebutton.close:active:backdrop { border-width: 2px; background-color: #8e3c00; border-left-color: #5b2600; border-top-color: #5b2600; border-right-color: #db5c00; border-bottom-color: #db5c00; } button.titlebutton.close:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } button.titlebutton.close:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -button.titlebutton.maximize { border-width: 2px; color: #d1ff96; background-color: #4db53d; border-left-color: #7ccf70; border-top-color: #7ccf70; border-right-color: #3d8f30; border-bottom-color: #3d8f30; } +button.titlebutton.maximize { border-width: 2px; color: #d1ff96; background-color: #42a53d; border-left-color: #6cc768; border-top-color: #6cc768; border-right-color: #33802f; border-bottom-color: #33802f; } -button.titlebutton.maximize:hover, button.titlebutton.maximize:hover:backdrop { border-width: 2px; background-color: #5ac24a; border-left-color: #8ed583; border-top-color: #8ed583; border-right-color: #45a237; border-bottom-color: #45a237; } +button.titlebutton.maximize:hover, button.titlebutton.maximize:hover:backdrop { border-width: 2px; background-color: #49b844; border-left-color: #7ece7a; border-top-color: #7ece7a; border-right-color: #3b9236; border-bottom-color: #3b9236; } -button.titlebutton.maximize:active, button.titlebutton.maximize:active:backdrop { border-width: 2px; background-color: #4db53d; border-left-color: #3d8f30; border-top-color: #3d8f30; border-right-color: #7ccf70; border-bottom-color: #7ccf70; } +button.titlebutton.maximize:active, button.titlebutton.maximize:active:backdrop { border-width: 2px; background-color: #42a53d; border-left-color: #33802f; border-top-color: #33802f; border-right-color: #6cc768; border-bottom-color: #6cc768; } button.titlebutton.maximize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } button.titlebutton.maximize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -button.titlebutton.minimize { border-width: 2px; color: #d1ff96; background-color: #ae8900; border-left-color: #fbc500; border-top-color: #fbc500; border-right-color: #7b6100; border-bottom-color: #7b6100; } +button.titlebutton.minimize { border-width: 2px; color: #d1ff96; background-color: #a37900; border-left-color: #f0b200; border-top-color: #f0b200; border-right-color: #705300; border-bottom-color: #705300; } -button.titlebutton.minimize:hover, button.titlebutton.minimize:hover:backdrop { border-width: 2px; background-color: #c89d00; border-left-color: #ffcd15; border-top-color: #ffcd15; border-right-color: #957500; border-bottom-color: #957500; } +button.titlebutton.minimize:hover, button.titlebutton.minimize:hover:backdrop { border-width: 2px; background-color: #bd8c00; border-left-color: #ffc00a; border-top-color: #ffc00a; border-right-color: #8a6600; border-bottom-color: #8a6600; } -button.titlebutton.minimize:active, button.titlebutton.minimize:active:backdrop { border-width: 2px; background-color: #ae8900; border-left-color: #7b6100; border-top-color: #7b6100; border-right-color: #fbc500; border-bottom-color: #fbc500; } +button.titlebutton.minimize:active, button.titlebutton.minimize:active:backdrop { border-width: 2px; background-color: #a37900; border-left-color: #705300; border-top-color: #705300; border-right-color: #f0b200; border-bottom-color: #f0b200; } button.titlebutton.minimize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index 1db85f2..30ca9e3 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -134,7 +134,7 @@ spinner:checked:disabled { opacity: 0.5; color: #7c675a; } .caption { font-weight: 400; font-size: 9pt; } /**************** Text Entries * */ -spinbutton.vertical > text, spinbutton:not(.vertical), entry { min-height: 32px; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; border-spacing: 6px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +spinbutton.vertical > text, spinbutton:not(.vertical), entry { min-height: 1.6em; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; border-spacing: 6px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } spinbutton.vertical > text, spinbutton:not(.vertical), entry { outline: 0 solid transparent; outline-offset: 4px; } @@ -212,7 +212,7 @@ editablelabel > stack > text { color: #EDF0F5; background-color: #323232; border to { background-image: radial-gradient(farthest-side, #f57900 95%, rgba(245, 121, 0, 0)); } } /****************************************************** Buttons * */ -notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { min-height: 24px; min-width: 16px; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { min-height: 1.6em; min-width: 1.6em; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { outline: 0 solid transparent; outline-offset: 4px; } @@ -442,7 +442,7 @@ spinbutton.vertical:disabled { color: #7c675a; } spinbutton.vertical:drop(active) { border-color: transparent; box-shadow: none; } -spinbutton.vertical > text { min-height: 32px; min-width: 32px; padding: 0; border-radius: 0; } +spinbutton.vertical > text { min-height: 1.6em; min-width: 1.6em; padding: 0; border-radius: 0; } spinbutton.vertical > text > selection { background-color: #669900; color: transparent; } @@ -450,7 +450,7 @@ spinbutton.vertical > text > selection:focus-within { background-color: rgba(102 spinbutton.vertical > text > block-cursor { color: #323232; background-color: #EDF0F5; } -spinbutton.vertical > button { min-height: 32px; min-width: 32px; padding: 0; } +spinbutton.vertical > button { min-height: 1.6em; min-width: 1.6em; padding: 0; } spinbutton.vertical > button.up { border-bottom-left-radius: 0; border-bottom-right-radius: 0; } @@ -539,38 +539,38 @@ windowcontrols:not(.empty).start:dir(rtl), windowcontrols:not(.empty).end:dir(lt windowcontrols button > image { background: none; } -windowcontrols button.close { border-width: 2px; color: #d1ff96; background-color: #994d00; border-left-color: #e67400; border-top-color: #e67400; border-right-color: #663300; border-bottom-color: #663300; } +windowcontrols button.close { border-width: 2px; color: #d1ff96; background-color: #8e3c00; border-left-color: #db5c00; border-top-color: #db5c00; border-right-color: #5b2600; border-bottom-color: #5b2600; } -windowcontrols button.close:hover, windowcontrols button.close:hover:backdrop { border-width: 2px; background-color: #b35a00; border-left-color: #ff8000; border-top-color: #ff8000; border-right-color: #804000; border-bottom-color: #804000; } +windowcontrols button.close:hover, windowcontrols button.close:hover:backdrop { border-width: 2px; background-color: #a84700; border-left-color: #f46700; border-top-color: #f46700; border-right-color: #753100; border-bottom-color: #753100; } -windowcontrols button.close:active, windowcontrols button.close:active:backdrop { border-width: 2px; background-color: #994d00; border-left-color: #663300; border-top-color: #663300; border-right-color: #e67400; border-bottom-color: #e67400; } +windowcontrols button.close:active, windowcontrols button.close:active:backdrop { border-width: 2px; background-color: #8e3c00; border-left-color: #5b2600; border-top-color: #5b2600; border-right-color: #db5c00; border-bottom-color: #db5c00; } windowcontrols button.close:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.close:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -windowcontrols button.maximize { border-width: 2px; color: #d1ff96; background-color: #4db53d; border-left-color: #7ccf70; border-top-color: #7ccf70; border-right-color: #3d8f30; border-bottom-color: #3d8f30; } +windowcontrols button.maximize { border-width: 2px; color: #d1ff96; background-color: #42a53d; border-left-color: #6cc768; border-top-color: #6cc768; border-right-color: #33802f; border-bottom-color: #33802f; } -windowcontrols button.maximize:hover, windowcontrols button.maximize:hover:backdrop { border-width: 2px; background-color: #5ac24a; border-left-color: #8ed583; border-top-color: #8ed583; border-right-color: #45a237; border-bottom-color: #45a237; } +windowcontrols button.maximize:hover, windowcontrols button.maximize:hover:backdrop { border-width: 2px; background-color: #49b844; border-left-color: #7ece7a; border-top-color: #7ece7a; border-right-color: #3b9236; border-bottom-color: #3b9236; } -windowcontrols button.maximize:active, windowcontrols button.maximize:active:backdrop { border-width: 2px; background-color: #4db53d; border-left-color: #3d8f30; border-top-color: #3d8f30; border-right-color: #7ccf70; border-bottom-color: #7ccf70; } +windowcontrols button.maximize:active, windowcontrols button.maximize:active:backdrop { border-width: 2px; background-color: #42a53d; border-left-color: #33802f; border-top-color: #33802f; border-right-color: #6cc768; border-bottom-color: #6cc768; } windowcontrols button.maximize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.maximize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -windowcontrols button.minimize { border-width: 2px; color: #d1ff96; background-color: #ae8900; border-left-color: #fbc500; border-top-color: #fbc500; border-right-color: #7b6100; border-bottom-color: #7b6100; } +windowcontrols button.minimize { border-width: 2px; color: #d1ff96; background-color: #a37900; border-left-color: #f0b200; border-top-color: #f0b200; border-right-color: #705300; border-bottom-color: #705300; } -windowcontrols button.minimize:hover, windowcontrols button.minimize:hover:backdrop { border-width: 2px; background-color: #c89d00; border-left-color: #ffcd15; border-top-color: #ffcd15; border-right-color: #957500; border-bottom-color: #957500; } +windowcontrols button.minimize:hover, windowcontrols button.minimize:hover:backdrop { border-width: 2px; background-color: #bd8c00; border-left-color: #ffc00a; border-top-color: #ffc00a; border-right-color: #8a6600; border-bottom-color: #8a6600; } -windowcontrols button.minimize:active, windowcontrols button.minimize:active:backdrop { border-width: 2px; background-color: #ae8900; border-left-color: #7b6100; border-top-color: #7b6100; border-right-color: #fbc500; border-bottom-color: #fbc500; } +windowcontrols button.minimize:active, windowcontrols button.minimize:active:backdrop { border-width: 2px; background-color: #a37900; border-left-color: #705300; border-top-color: #705300; border-right-color: #f0b200; border-bottom-color: #f0b200; } windowcontrols button.minimize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.minimize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } /*************** Header bars * */ -.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-radius: 0; border: none; background-color: #669900; color: #d1ff96; /* Darken switchbuttons for headerbars. issue #1588 */ } +.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 2.5em; border-radius: 0; border: none; background-color: #507800; color: #d1ff96; /* Darken switchbuttons for headerbars. issue #1588 */ } .titlebar:backdrop:not(headerbar), headerbar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -934,27 +934,27 @@ checkbutton:focus:focus-visible { outline-color: rgba(102, 153, 0, 0.5); outline checkbutton.text-button { padding: 4px; } -check, radio { min-height: 14px; min-width: 14px; border: 1px solid; } +check, radio { min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; } -check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #5a6659 20%, #4e584d 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check, radio { background-clip: padding-box; background-image: image(#4e584d); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #4e584d; color: #d1ff96; } -check:hover, radio:hover { background-image: linear-gradient(to bottom, #647062 10%, #586357 90%); } +check:hover, radio:hover { background-image: image(#5f6b5e); } check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#424a41); } check:disabled, radio:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:checked, radio:checked { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:checked, radio:checked { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:checked:hover, radio:checked:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:checked:hover, radio:checked:hover { background-image: image(#7ebd00); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } check:checked:disabled, radio:checked:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:indeterminate:hover, radio:indeterminate:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:indeterminate:hover, radio:indeterminate:hover { background-image: image(#7ebd00); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -1457,7 +1457,7 @@ colorchooser .popover.osd { border-radius: 0px; } /********************** Window Decorations * */ window { border-width: 0px; border-radius: 0px; } -window.csd, window.solid-csd { box-shadow: 0 0 0 4px #88cc00, 2px 2px 0 2px #4e7500; } +window.csd, window.solid-csd { box-shadow: 0 0 0 4px #72ab00, 2px 2px 0 2px #385400; } window.csd:backdrop, window.solid-csd:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } diff --git a/source/common/_theme_colors.scss b/source/common/_theme_colors.scss index 6de2583..45acedb 100644 --- a/source/common/_theme_colors.scss +++ b/source/common/_theme_colors.scss @@ -22,7 +22,7 @@ $successc: #33d17a; $titlebar_active_fg: #d1ff96; -$titlebar_active_bg: #669900; +$titlebar_active_bg: #507800; $titlebar_backdrop_fg: #EDF0F5; $titlebar_backdrop_bg: #3f3e3e; diff --git a/source/common/checkradios.scss b/source/common/checkradios.scss index 69ad991..3d838ac 100644 --- a/source/common/checkradios.scss +++ b/source/common/checkradios.scss @@ -18,14 +18,17 @@ @if $t==normal { background-clip: if($checked, border-box, padding-box); - background-image: linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%); - border-color: $_border_color; - box-shadow: 0 1px transparentize(black, 0.95); + background-image: image($c); //linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%); + //border-color: $_border_color; + border-width: $border_width; + @include relief($_border_color); + background-color: $c; + //box-shadow: 0 1px transparentize(black, 0.95); color: $tc; } @if $t==hover { - background-image: if($c == white, image(darken($c, 5%)), linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%)); + background-image: if($c == white, image(darken($c, 5%)), image(lighten($c, 7%))); } @if $t==active { diff --git a/source/common/common_common.scss b/source/common/common_common.scss index 3b4f1c4..aa7ccda 100644 --- a/source/common/common_common.scss +++ b/source/common/common_common.scss @@ -4,8 +4,8 @@ // Optional compact sizes for buttons, headerbar and headerbar widgets $_sizevariant: 'compact'; //either 'default', or compact otherwise -$_headerbar_height: if($_sizevariant=='default', 46px, 40px); -$_entry_height: if($_sizevariant=='default', 32px, 28px); +$_headerbar_height: if($_sizevariant=='default', 3em, 2.5em); +$_entry_height: if($_sizevariant=='default', 1.9em, 1.6em); $_btn_pad: if($_sizevariant=='default', 4px 9px, 2px 4px); $_hb_btn_pad: if($_sizevariant=='default', 6px, 5px); $_img_btn_pad: if($_sizevariant=='default', 5px, 2px); @@ -24,8 +24,8 @@ $button_transition: none; //all 200ms $ease-out-quad; //added by me: $border_width: 2px; - $button_min_height: 24px; - $button_min_width: 16px; + $button_min_height: 1.6em; + $button_min_width: 1.6em; $button_padding: $_btn_pad; $button_border: $border_width solid; diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css index 20c7362..ec6c0f6 100644 --- a/source/gtk3/gtk-new.css +++ b/source/gtk3/gtk-new.css @@ -100,7 +100,7 @@ spinner:checked:disabled { opacity: 0.5; color: #7c675a; } .caption { font-weight: 400; font-size: 9pt; } /**************** Text Entries * */ -spinbutton:not(.vertical), entry { min-height: 28px; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; } +spinbutton:not(.vertical), entry { min-height: 1.6em; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; } spinbutton:not(.vertical) image.left, entry image.left { margin-right: 6px; } @@ -168,7 +168,7 @@ treeview entry.flat:focus, treeview entry:focus { border-color: #669900; } @keyframes needs_attention { from { background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#f57900), to(transparent)); } to { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#669900), to(transparent)); } } -button.titlebutton, scrollbar slider, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, calendar.button, button { min-height: 24px; min-width: 16px; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } +button.titlebutton, scrollbar slider, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, calendar.button, button { min-height: 1.6em; min-width: 1.6em; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } button.sidebar-button, notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, scrollbar slider.flat:not(:hover):not(:active):not(:checked):not(:disabled), notebook > header > tabs > arrow.flat:not(:hover):not(:active):not(:checked):not(:disabled), calendar.flat.button:not(:hover):not(:active):not(:checked):not(:disabled), button.flat:not(:hover):not(:active):not(:checked):not(:disabled) { border-width: 2px; border-color: transparent; background-color: transparent; background-image: none; text-shadow: none; -gtk-icon-shadow: none; transition: none; } @@ -458,7 +458,7 @@ searchbar > revealer > box { margin: -6px; padding: 6px; } .inline-toolbar, searchbar > revealer > box, .location-bar { border-style: solid; background-color: #313030; } /*************** Header bars * */ -.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 40px; border: none; border-radius: 0px; background-color: #669900; color: #d1ff96; border: none; /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ } +.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 2.5em; border: none; border-radius: 0px; background-color: #507800; color: #d1ff96; border: none; /* Darken switchbuttons for headerbars. issue #1588 */ /* hide the close button separator */ } .titlebar:backdrop:not(headerbar), headerbar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -868,9 +868,9 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; } -check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #5a6659 20%, #4e584d 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check, radio { background-clip: padding-box; background-image: image(#4e584d); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #4e584d; color: #d1ff96; } -check:hover, radio:hover { background-image: linear-gradient(to bottom, #647062 10%, #586357 90%); } +check:hover, radio:hover { background-image: image(#5f6b5e); } check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#424a41); } @@ -880,9 +880,9 @@ check:backdrop, radio:backdrop { background-image: image(#4e584d); box-shadow: n check:backdrop:disabled, radio:backdrop:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:checked, radio:checked { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:checked, radio:checked { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:checked:hover, radio:checked:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:checked:hover, radio:checked:hover { background-image: image(#7ebd00); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -892,9 +892,9 @@ check:checked:backdrop, radio:checked:backdrop { background-image: image(#669900 check:checked:backdrop:disabled, radio:checked:backdrop:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:indeterminate:hover, radio:indeterminate:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:indeterminate:hover, radio:indeterminate:hover { background-image: image(#7ebd00); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -1322,7 +1322,7 @@ colorchooser .popover.osd { border-radius: 5px; } .scale-popup button:hover { background-color: rgba(237, 240, 245, 0.1); } /********************** Window Decorations * */ -decoration { border-radius: 0px 0px 0 0; box-shadow: 0 0 0 4px #88cc00, 2px 2px 0 2px #4e7500; margin: 8px; } +decoration { border-radius: 0px 0px 0 0; box-shadow: 0 0 0 4px #72ab00, 2px 2px 0 2px #385400; margin: 8px; } decoration:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } @@ -1332,31 +1332,31 @@ decoration:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } tooltip.csd decoration { border-radius: 0px; box-shadow: none; } -button.titlebutton.close { border-width: 2px; color: #d1ff96; background-color: #994d00; border-left-color: #e67400; border-top-color: #e67400; border-right-color: #663300; border-bottom-color: #663300; } +button.titlebutton.close { border-width: 2px; color: #d1ff96; background-color: #8e3c00; border-left-color: #db5c00; border-top-color: #db5c00; border-right-color: #5b2600; border-bottom-color: #5b2600; } -button.titlebutton.close:hover, button.titlebutton.close:hover:backdrop { border-width: 2px; background-color: #b35a00; border-left-color: #ff8000; border-top-color: #ff8000; border-right-color: #804000; border-bottom-color: #804000; } +button.titlebutton.close:hover, button.titlebutton.close:hover:backdrop { border-width: 2px; background-color: #a84700; border-left-color: #f46700; border-top-color: #f46700; border-right-color: #753100; border-bottom-color: #753100; } -button.titlebutton.close:active, button.titlebutton.close:active:backdrop { border-width: 2px; background-color: #994d00; border-left-color: #663300; border-top-color: #663300; border-right-color: #e67400; border-bottom-color: #e67400; } +button.titlebutton.close:active, button.titlebutton.close:active:backdrop { border-width: 2px; background-color: #8e3c00; border-left-color: #5b2600; border-top-color: #5b2600; border-right-color: #db5c00; border-bottom-color: #db5c00; } button.titlebutton.close:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } button.titlebutton.close:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -button.titlebutton.maximize { border-width: 2px; color: #d1ff96; background-color: #4db53d; border-left-color: #7ccf70; border-top-color: #7ccf70; border-right-color: #3d8f30; border-bottom-color: #3d8f30; } +button.titlebutton.maximize { border-width: 2px; color: #d1ff96; background-color: #42a53d; border-left-color: #6cc768; border-top-color: #6cc768; border-right-color: #33802f; border-bottom-color: #33802f; } -button.titlebutton.maximize:hover, button.titlebutton.maximize:hover:backdrop { border-width: 2px; background-color: #5ac24a; border-left-color: #8ed583; border-top-color: #8ed583; border-right-color: #45a237; border-bottom-color: #45a237; } +button.titlebutton.maximize:hover, button.titlebutton.maximize:hover:backdrop { border-width: 2px; background-color: #49b844; border-left-color: #7ece7a; border-top-color: #7ece7a; border-right-color: #3b9236; border-bottom-color: #3b9236; } -button.titlebutton.maximize:active, button.titlebutton.maximize:active:backdrop { border-width: 2px; background-color: #4db53d; border-left-color: #3d8f30; border-top-color: #3d8f30; border-right-color: #7ccf70; border-bottom-color: #7ccf70; } +button.titlebutton.maximize:active, button.titlebutton.maximize:active:backdrop { border-width: 2px; background-color: #42a53d; border-left-color: #33802f; border-top-color: #33802f; border-right-color: #6cc768; border-bottom-color: #6cc768; } button.titlebutton.maximize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } button.titlebutton.maximize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -button.titlebutton.minimize { border-width: 2px; color: #d1ff96; background-color: #ae8900; border-left-color: #fbc500; border-top-color: #fbc500; border-right-color: #7b6100; border-bottom-color: #7b6100; } +button.titlebutton.minimize { border-width: 2px; color: #d1ff96; background-color: #a37900; border-left-color: #f0b200; border-top-color: #f0b200; border-right-color: #705300; border-bottom-color: #705300; } -button.titlebutton.minimize:hover, button.titlebutton.minimize:hover:backdrop { border-width: 2px; background-color: #c89d00; border-left-color: #ffcd15; border-top-color: #ffcd15; border-right-color: #957500; border-bottom-color: #957500; } +button.titlebutton.minimize:hover, button.titlebutton.minimize:hover:backdrop { border-width: 2px; background-color: #bd8c00; border-left-color: #ffc00a; border-top-color: #ffc00a; border-right-color: #8a6600; border-bottom-color: #8a6600; } -button.titlebutton.minimize:active, button.titlebutton.minimize:active:backdrop { border-width: 2px; background-color: #ae8900; border-left-color: #7b6100; border-top-color: #7b6100; border-right-color: #fbc500; border-bottom-color: #fbc500; } +button.titlebutton.minimize:active, button.titlebutton.minimize:active:backdrop { border-width: 2px; background-color: #a37900; border-left-color: #705300; border-top-color: #705300; border-right-color: #f0b200; border-bottom-color: #f0b200; } button.titlebutton.minimize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss index d9d4bcc..daebcb1 100644 --- a/source/gtk4/_common.scss +++ b/source/gtk4/_common.scss @@ -1,6 +1,6 @@ @import '../common/common_common.scss'; -$assets: if($contrast=='normal', 'assets', 'assets-hc'); +$assets: 'assets'; // if($contrast=='normal', 'assets', 'assets-hc'); $focus_transition:none;// outline-width 200ms $ease-out-quad, outline-offset 200ms $ease-out-quad; $menu_margin: $menu_radius +1px; //margin around menuitems & sidebar items @@ -277,7 +277,7 @@ spinner { %entry, entry { %entry_basic, & { - min-height: 32px; + min-height: $_entry_height; padding-left: 1px; padding-right: 1px; border: $border_width solid; @@ -1068,8 +1068,8 @@ spinbutton { > text { @extend %entry; - min-height: 32px; - min-width: 32px; + min-height: $_entry_height; + min-width: $_entry_height; padding: 0; border-radius: 0; @@ -1085,8 +1085,8 @@ spinbutton { } > button { - min-height: 32px; - min-width: 32px; + min-height: $button_min_height; + min-width: $button_min_width; padding: 0; &.up { @extend %top_button; } @@ -1380,7 +1380,7 @@ windowcontrols { %titlebar, headerbar { padding: 0 6px; - min-height: 46px; + min-height: $_headerbar_height; //border-width: 0 0 1px; //border-style: solid; //border-color: $alt_borders_color; @@ -2160,7 +2160,7 @@ radio { min-height: 14px; min-width: 14px; border: 1px solid; - //-gtk-icon-source: none; + -gtk-icon-source: none; & { // for unchecked @@ -2217,10 +2217,12 @@ check { -gtk-icon-size: 14px; &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/check-symbolic.symbolic.png")), - -gtk-recolor(url("#{$assets}/check@2-symbolic.symbolic.png"))); } + -gtk-recolor(url("#{$assets}/check@2-symbolic.symbolic.png"))); + } &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")), -gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); } + } %radio, diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css index 1db85f2..30ca9e3 100644 --- a/source/gtk4/gtk-new.css +++ b/source/gtk4/gtk-new.css @@ -134,7 +134,7 @@ spinner:checked:disabled { opacity: 0.5; color: #7c675a; } .caption { font-weight: 400; font-size: 9pt; } /**************** Text Entries * */ -spinbutton.vertical > text, spinbutton:not(.vertical), entry { min-height: 32px; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; border-spacing: 6px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +spinbutton.vertical > text, spinbutton:not(.vertical), entry { min-height: 1.6em; padding-left: 1px; padding-right: 1px; border: 2px solid; border-radius: 0px; border-spacing: 6px; transition: none; color: #EDF0F5; background-color: #323232; border-left-color: #191919; border-top-color: #191919; border-right-color: #585858; border-bottom-color: #585858; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } spinbutton.vertical > text, spinbutton:not(.vertical), entry { outline: 0 solid transparent; outline-offset: 4px; } @@ -212,7 +212,7 @@ editablelabel > stack > text { color: #EDF0F5; background-color: #323232; border to { background-image: radial-gradient(farthest-side, #f57900 95%, rgba(245, 121, 0, 0)); } } /****************************************************** Buttons * */ -notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { min-height: 24px; min-width: 16px; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } +notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { min-height: 1.6em; min-width: 1.6em; padding: 2px 4px; border: 2px solid; border-radius: 0px; transition: none; border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; transition-property: outline, outline-width, outline-offset, outline-color; transition-duration: 300ms; animation-timing-function: ease-in-out; } notebook > header > tabs > arrow, notebook.frame > header > tabs > arrow, .nautilus-path-bar .path-buttons-box button, windowcontrols button, button { outline: 0 solid transparent; outline-offset: 4px; } @@ -442,7 +442,7 @@ spinbutton.vertical:disabled { color: #7c675a; } spinbutton.vertical:drop(active) { border-color: transparent; box-shadow: none; } -spinbutton.vertical > text { min-height: 32px; min-width: 32px; padding: 0; border-radius: 0; } +spinbutton.vertical > text { min-height: 1.6em; min-width: 1.6em; padding: 0; border-radius: 0; } spinbutton.vertical > text > selection { background-color: #669900; color: transparent; } @@ -450,7 +450,7 @@ spinbutton.vertical > text > selection:focus-within { background-color: rgba(102 spinbutton.vertical > text > block-cursor { color: #323232; background-color: #EDF0F5; } -spinbutton.vertical > button { min-height: 32px; min-width: 32px; padding: 0; } +spinbutton.vertical > button { min-height: 1.6em; min-width: 1.6em; padding: 0; } spinbutton.vertical > button.up { border-bottom-left-radius: 0; border-bottom-right-radius: 0; } @@ -539,38 +539,38 @@ windowcontrols:not(.empty).start:dir(rtl), windowcontrols:not(.empty).end:dir(lt windowcontrols button > image { background: none; } -windowcontrols button.close { border-width: 2px; color: #d1ff96; background-color: #994d00; border-left-color: #e67400; border-top-color: #e67400; border-right-color: #663300; border-bottom-color: #663300; } +windowcontrols button.close { border-width: 2px; color: #d1ff96; background-color: #8e3c00; border-left-color: #db5c00; border-top-color: #db5c00; border-right-color: #5b2600; border-bottom-color: #5b2600; } -windowcontrols button.close:hover, windowcontrols button.close:hover:backdrop { border-width: 2px; background-color: #b35a00; border-left-color: #ff8000; border-top-color: #ff8000; border-right-color: #804000; border-bottom-color: #804000; } +windowcontrols button.close:hover, windowcontrols button.close:hover:backdrop { border-width: 2px; background-color: #a84700; border-left-color: #f46700; border-top-color: #f46700; border-right-color: #753100; border-bottom-color: #753100; } -windowcontrols button.close:active, windowcontrols button.close:active:backdrop { border-width: 2px; background-color: #994d00; border-left-color: #663300; border-top-color: #663300; border-right-color: #e67400; border-bottom-color: #e67400; } +windowcontrols button.close:active, windowcontrols button.close:active:backdrop { border-width: 2px; background-color: #8e3c00; border-left-color: #5b2600; border-top-color: #5b2600; border-right-color: #db5c00; border-bottom-color: #db5c00; } windowcontrols button.close:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.close:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -windowcontrols button.maximize { border-width: 2px; color: #d1ff96; background-color: #4db53d; border-left-color: #7ccf70; border-top-color: #7ccf70; border-right-color: #3d8f30; border-bottom-color: #3d8f30; } +windowcontrols button.maximize { border-width: 2px; color: #d1ff96; background-color: #42a53d; border-left-color: #6cc768; border-top-color: #6cc768; border-right-color: #33802f; border-bottom-color: #33802f; } -windowcontrols button.maximize:hover, windowcontrols button.maximize:hover:backdrop { border-width: 2px; background-color: #5ac24a; border-left-color: #8ed583; border-top-color: #8ed583; border-right-color: #45a237; border-bottom-color: #45a237; } +windowcontrols button.maximize:hover, windowcontrols button.maximize:hover:backdrop { border-width: 2px; background-color: #49b844; border-left-color: #7ece7a; border-top-color: #7ece7a; border-right-color: #3b9236; border-bottom-color: #3b9236; } -windowcontrols button.maximize:active, windowcontrols button.maximize:active:backdrop { border-width: 2px; background-color: #4db53d; border-left-color: #3d8f30; border-top-color: #3d8f30; border-right-color: #7ccf70; border-bottom-color: #7ccf70; } +windowcontrols button.maximize:active, windowcontrols button.maximize:active:backdrop { border-width: 2px; background-color: #42a53d; border-left-color: #33802f; border-top-color: #33802f; border-right-color: #6cc768; border-bottom-color: #6cc768; } windowcontrols button.maximize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.maximize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } -windowcontrols button.minimize { border-width: 2px; color: #d1ff96; background-color: #ae8900; border-left-color: #fbc500; border-top-color: #fbc500; border-right-color: #7b6100; border-bottom-color: #7b6100; } +windowcontrols button.minimize { border-width: 2px; color: #d1ff96; background-color: #a37900; border-left-color: #f0b200; border-top-color: #f0b200; border-right-color: #705300; border-bottom-color: #705300; } -windowcontrols button.minimize:hover, windowcontrols button.minimize:hover:backdrop { border-width: 2px; background-color: #c89d00; border-left-color: #ffcd15; border-top-color: #ffcd15; border-right-color: #957500; border-bottom-color: #957500; } +windowcontrols button.minimize:hover, windowcontrols button.minimize:hover:backdrop { border-width: 2px; background-color: #bd8c00; border-left-color: #ffc00a; border-top-color: #ffc00a; border-right-color: #8a6600; border-bottom-color: #8a6600; } -windowcontrols button.minimize:active, windowcontrols button.minimize:active:backdrop { border-width: 2px; background-color: #ae8900; border-left-color: #7b6100; border-top-color: #7b6100; border-right-color: #fbc500; border-bottom-color: #fbc500; } +windowcontrols button.minimize:active, windowcontrols button.minimize:active:backdrop { border-width: 2px; background-color: #a37900; border-left-color: #705300; border-top-color: #705300; border-right-color: #f0b200; border-bottom-color: #f0b200; } windowcontrols button.minimize:disabled { border-width: 2px; color: #7c675a; background-color: #493e37; border-left-color: #756358; border-top-color: #756358; border-right-color: #2c2521; border-bottom-color: #2c2521; } windowcontrols button.minimize:backdrop { border-width: 2px; color: #EDF0F5; background-color: #4e584d; border-left-color: #728171; border-top-color: #728171; border-right-color: #363d35; border-bottom-color: #363d35; } /*************** Header bars * */ -.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 46px; border-radius: 0; border: none; background-color: #669900; color: #d1ff96; /* Darken switchbuttons for headerbars. issue #1588 */ } +.titlebar:not(headerbar), headerbar { padding: 0 6px; min-height: 2.5em; border-radius: 0; border: none; background-color: #507800; color: #d1ff96; /* Darken switchbuttons for headerbars. issue #1588 */ } .titlebar:backdrop:not(headerbar), headerbar:backdrop { background-color: #3f3e3e; color: #EDF0F5; transition: none; } @@ -934,27 +934,27 @@ checkbutton:focus:focus-visible { outline-color: rgba(102, 153, 0, 0.5); outline checkbutton.text-button { padding: 4px; } -check, radio { min-height: 14px; min-width: 14px; border: 1px solid; } +check, radio { min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; } -check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #5a6659 20%, #4e584d 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check, radio { background-clip: padding-box; background-image: image(#4e584d); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #4e584d; color: #d1ff96; } -check:hover, radio:hover { background-image: linear-gradient(to bottom, #647062 10%, #586357 90%); } +check:hover, radio:hover { background-image: image(#5f6b5e); } check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#424a41); } check:disabled, radio:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:checked, radio:checked { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:checked, radio:checked { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:checked:hover, radio:checked:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:checked:hover, radio:checked:hover { background-image: image(#7ebd00); } check:checked:active, radio:checked:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } check:checked:disabled, radio:checked:disabled { box-shadow: none; color: #7c675a; background-image: image(#493e37); } -check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: linear-gradient(to bottom, #77b300 20%, #669900 90%); border-color: #d1ff96; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #d1ff96; } +check:indeterminate, radio:indeterminate { background-clip: border-box; background-image: image(#669900); border-width: 2px; background-color: #d1ff96; border-left-color: #f3ffe3; border-top-color: #f3ffe3; border-right-color: #bbff63; border-bottom-color: #bbff63; background-color: #669900; color: #d1ff96; } -check:indeterminate:hover, radio:indeterminate:hover { background-image: linear-gradient(to bottom, #85c700 10%, #74ad00 90%); } +check:indeterminate:hover, radio:indeterminate:hover { background-image: image(#7ebd00); } check:indeterminate:active, radio:indeterminate:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#558000); } @@ -1457,7 +1457,7 @@ colorchooser .popover.osd { border-radius: 0px; } /********************** Window Decorations * */ window { border-width: 0px; border-radius: 0px; } -window.csd, window.solid-csd { box-shadow: 0 0 0 4px #88cc00, 2px 2px 0 2px #4e7500; } +window.csd, window.solid-csd { box-shadow: 0 0 0 4px #72ab00, 2px 2px 0 2px #385400; } window.csd:backdrop, window.solid-csd:backdrop { box-shadow: 0 0 0 4px #595757, 2px 2px 0 2px #2d2c2c; } diff --git a/source/templates/colorscheme-Simple.sh b/source/templates/colorscheme-Simple.sh index d1fa1e9..952d123 100755 --- a/source/templates/colorscheme-Simple.sh +++ b/source/templates/colorscheme-Simple.sh @@ -34,7 +34,7 @@ vsuccessc="#33d17a" vtitlebar_active_fg=$vselected_fg -vtitlebar_active_bg=$vselected_bg +vtitlebar_active_bg="#507800" vtitlebar_backdrop_fg=$vwindow_fg vtitlebar_backdrop_bg=$vwindow_bg