From c0aa50f658c4b1c8d1a9f518c146441e04d818e7 Mon Sep 17 00:00:00 2001 From: eudaimon Date: Tue, 19 Apr 2022 20:26:42 +0200 Subject: [PATCH] small fixes --- gtk-3.0/gtk.css | 2 +- gtk-4.0/gtk.css | 8 ++++---- source/gtk3/gtk-new.css | 2 +- source/gtk4/_common.scss | 2 +- source/gtk4/gtk-new.css | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index e8d8716..d93ffcb 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,4 +1,4 @@ -/*these might have white text on them or window_fg text, bear it in mind when chosing colors. Usually an automatic fg color should check this value!*/ +/*Usually an automatic fg color on these backgrounds should check this value!*/ /*************************** Check and Radio buttons * */ /*************************** Check and Radio buttons * */ calendar:selected, row:selected, treeview.view:selected:focus, treeview.view:selected, modelbutton.flat:selected, .menuitem.button.flat:selected, spinbutton:not(.vertical) selection, entry selection, flowbox flowboxchild:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected { background-color: #b0dd7e; } diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index f879509..186fc29 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -5,7 +5,7 @@ $fg_color: if($variant == 'light', #2e3436, #eeeeec); $selected_fg_color: #ffffff; $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));*/ -/*these might have white text on them or window_fg text, bear it in mind when chosing colors. Usually an automatic fg color should check this value!*/ +/*Usually an automatic fg color on these backgrounds should check this value!*/ /*************************** Check and Radio buttons * */ /*************************** Check and Radio buttons * */ calendar > grid > label.day-number:selected, row:selected, columnview.view:selected:focus, columnview.view:selected, treeview.view:selected:focus, treeview.view:selected, modelbutton.flat:selected, gridview > child:selected, flowbox > flowboxchild:selected, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, textview > text:selected:focus, textview > text:selected { background-color: #b0dd7e; } @@ -949,11 +949,11 @@ checkbutton.text-button { padding: 4px; } 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, white 20%, white 90%); border-color: #6a6a6a; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #000000; } +check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #c9cac6 20%, #bcbeb9 90%); border-color: #6a6a6a; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #000000; } -check:hover, radio:hover { background-image: image(#f2f2f2); } +check:hover, radio:hover { background-image: linear-gradient(to bottom, #d3d4d1 10%, #c6c8c4 90%); } -check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#d9d9d9); } +check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#afb2ac); } check:disabled, radio:disabled { box-shadow: none; color: #552222; background-image: image(#938989); } diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css index e8d8716..d93ffcb 100644 --- a/source/gtk3/gtk-new.css +++ b/source/gtk3/gtk-new.css @@ -1,4 +1,4 @@ -/*these might have white text on them or window_fg text, bear it in mind when chosing colors. Usually an automatic fg color should check this value!*/ +/*Usually an automatic fg color on these backgrounds should check this value!*/ /*************************** Check and Radio buttons * */ /*************************** Check and Radio buttons * */ calendar:selected, row:selected, treeview.view:selected:focus, treeview.view:selected, modelbutton.flat:selected, .menuitem.button.flat:selected, spinbutton:not(.vertical) selection, entry selection, flowbox flowboxchild:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected { background-color: #b0dd7e; } diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss index 4f026e3..fe7046e 100644 --- a/source/gtk4/_common.scss +++ b/source/gtk4/_common.scss @@ -2466,7 +2466,7 @@ radio { & { // for unchecked - $_c: if($variant=='light', white, $bg_color); + $_c: $button_bg;//if($variant=='light', white, $bg_color); @each $state, $t in ("", "normal"), (":hover", "hover"), diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css index f879509..186fc29 100644 --- a/source/gtk4/gtk-new.css +++ b/source/gtk4/gtk-new.css @@ -5,7 +5,7 @@ $fg_color: if($variant == 'light', #2e3436, #eeeeec); $selected_fg_color: #ffffff; $selected_bg_color: if($variant == 'light', #3584e4, darken(#3584e4, 20%));*/ -/*these might have white text on them or window_fg text, bear it in mind when chosing colors. Usually an automatic fg color should check this value!*/ +/*Usually an automatic fg color on these backgrounds should check this value!*/ /*************************** Check and Radio buttons * */ /*************************** Check and Radio buttons * */ calendar > grid > label.day-number:selected, row:selected, columnview.view:selected:focus, columnview.view:selected, treeview.view:selected:focus, treeview.view:selected, modelbutton.flat:selected, gridview > child:selected, flowbox > flowboxchild:selected, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, textview > text:selected:focus, textview > text:selected { background-color: #b0dd7e; } @@ -949,11 +949,11 @@ checkbutton.text-button { padding: 4px; } 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, white 20%, white 90%); border-color: #6a6a6a; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #000000; } +check, radio { background-clip: padding-box; background-image: linear-gradient(to bottom, #c9cac6 20%, #bcbeb9 90%); border-color: #6a6a6a; box-shadow: 0 1px rgba(0, 0, 0, 0.05); color: #000000; } -check:hover, radio:hover { background-image: image(#f2f2f2); } +check:hover, radio:hover { background-image: linear-gradient(to bottom, #d3d4d1 10%, #c6c8c4 90%); } -check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#d9d9d9); } +check:active, radio:active { box-shadow: inset 0 1px rgba(0, 0, 0, 0.2); background-image: image(#afb2ac); } check:disabled, radio:disabled { box-shadow: none; color: #552222; background-image: image(#938989); }