luneko/SweetTokyoNight
1
0
Fork 0
mirror of https://github.com/luneko/SweetTokyoNight.git synced 2025-12-13 15:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Gtk-4: Fix border-color of focused entries

Browse Source
This commit is contained in:
EliverLara
2021-12-05 14:12:13 -06:00
parent 5bb08cbddb
commit cbdc4ce8f3
3 changed files with 220 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gtk-4.0/gtk-dark.css
View File

@@ -1685,8 +1685,8 @@ spinbutton:not(.vertical), entry {
background-position: right center; background-position: right center;
border: none; border: none;
box-shadow: none; } box-shadow: none; }
spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical), spinbutton.flat:focus-within:not(.vertical), spinbutton.flat:not(.vertical),
entry.flat:focus, entry.flat:focus-within,
entry.flat { entry.flat {
min-height: 0; min-height: 0;
padding: 2px; padding: 2px;
@@ -1694,8 +1694,8 @@ spinbutton:not(.vertical), entry {
border-color: transparent; border-color: transparent;
box-shadow: none; box-shadow: none;
border-radius: 0; } border-radius: 0; }
spinbutton:focus:not(.vertical), spinbutton:focus-within:not(.vertical),
entry:focus { entry:focus-within {
border-color: #980ba2; } border-color: #980ba2; }
spinbutton:disabled:not(.vertical), spinbutton:disabled:not(.vertical),
entry:disabled { entry:disabled {
@@ -1723,8 +1723,8 @@ spinbutton:not(.vertical), entry {
background-color: #181b28; background-color: #181b28;
color: #e6133e; color: #e6133e;
border-color: #410512; } border-color: #410512; }
spinbutton.error:focus:not(.vertical), spinbutton.error:focus-within:not(.vertical),
entry.error:focus { entry.error:focus-within {
border-color: #410512; } border-color: #410512; }
spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical), spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
entry.error:selected:focus, entry.error:selected:focus,
@@ -1737,8 +1737,8 @@ spinbutton:not(.vertical), entry {
background-color: #181b28; background-color: #181b28;
color: #cc5500; color: #cc5500;
border-color: #1a0b00; } border-color: #1a0b00; }
spinbutton.warning:focus:not(.vertical), spinbutton.warning:focus-within:not(.vertical),
entry.warning:focus { entry.warning:focus-within {
border-color: #1a0b00; } border-color: #1a0b00; }
spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical), spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
entry.warning:selected:focus, entry.warning:selected:focus,
@@ -1756,8 +1756,8 @@ spinbutton:not(.vertical), entry {
spinbutton:not(.vertical) image:backdrop, spinbutton:not(.vertical) image:backdrop,
entry image:backdrop { entry image:backdrop {
color: #5c5f6b; } color: #5c5f6b; }
spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), spinbutton:drop(active):focus-within:not(.vertical), spinbutton:drop(active):not(.vertical),
entry:drop(active):focus, entry:drop(active):focus-within,
entry:drop(active) { entry:drop(active) {
border-color: #71f79f; border-color: #71f79f;
box-shadow: inset 0 0 0 1px #71f79f; } box-shadow: inset 0 0 0 1px #71f79f; }
@@ -1769,8 +1769,8 @@ spinbutton:not(.vertical), entry {
box-shadow: none; box-shadow: none;
text-shadow: 0 1px black; text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; } -gtk-icon-shadow: 0 1px black; }
.osd spinbutton:focus:not(.vertical), .osd spinbutton:focus-within:not(.vertical),
.osd entry:focus { .osd entry:focus-within {
color: white; color: white;
border-color: #c50ed2; border-color: #c50ed2;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
@@ -1808,16 +1808,16 @@ entry progress {
spinbutton:not(.vertical) progress:backdrop, spinbutton:not(.vertical) progress:backdrop,
entry progress:backdrop { entry progress:backdrop {
background-color: transparent; } background-color: transparent; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) >
entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus-within + spinbutton:not(.vertical), .linked:not(.vertical) >
entry:focus + button, .linked:not(.vertical) > entry:focus-within + button, .linked:not(.vertical) >
entry:focus + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry:focus-within + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) +
entry, .linked:not(.vertical) > entry, .linked:not(.vertical) >
entry:focus + entry:focus-within +
entry { entry {
border-left-color: #980ba2; } border-left-color: #980ba2; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical), .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:focus-within:not(.vertical), .linked:not(.vertical) >
entry:focus { entry:focus-within {
border-color: #980ba2; } border-color: #980ba2; }
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) >
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) >
@@ -1878,14 +1878,14 @@ entry:drop(active):not(:only-child) + button,
entry:drop(active):not(:only-child) + combobox > box > button.combo { entry:drop(active):not(:only-child) + combobox > box > button.combo {
border-top-color: #71f79f; } border-top-color: #71f79f; }
treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { treeview entry:focus-within:dir(rtl), treeview entry:focus-within:dir(ltr) {
background-color: #181b28; background-color: #181b28;
transition-property: color, background; } transition-property: color, background; }
treeview entry.flat, treeview entry { treeview entry.flat, treeview entry {
border-radius: 0; border-radius: 0;
background-image: none; background-image: none;
background-color: #181b28; } background-color: #181b28; }
treeview entry.flat:focus, treeview entry:focus { treeview entry.flat:focus-within, treeview entry:focus-within {
border-color: #c50ed2; } border-color: #c50ed2; }
/************* /*************

42
gtk-4.0/gtk.css
View File

@@ -1685,8 +1685,8 @@ spinbutton:not(.vertical), entry {
background-position: right center; background-position: right center;
border: none; border: none;
box-shadow: none; } box-shadow: none; }
spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical), spinbutton.flat:focus-within:not(.vertical), spinbutton.flat:not(.vertical),
entry.flat:focus, entry.flat:focus-within,
entry.flat { entry.flat {
min-height: 0; min-height: 0;
padding: 2px; padding: 2px;
@@ -1694,8 +1694,8 @@ spinbutton:not(.vertical), entry {
border-color: transparent; border-color: transparent;
box-shadow: none; box-shadow: none;
border-radius: 0; } border-radius: 0; }
spinbutton:focus:not(.vertical), spinbutton:focus-within:not(.vertical),
entry:focus { entry:focus-within {
border-color: #980ba2; } border-color: #980ba2; }
spinbutton:disabled:not(.vertical), spinbutton:disabled:not(.vertical),
entry:disabled { entry:disabled {
@@ -1723,8 +1723,8 @@ spinbutton:not(.vertical), entry {
background-color: #181b28; background-color: #181b28;
color: #e6133e; color: #e6133e;
border-color: #410512; } border-color: #410512; }
spinbutton.error:focus:not(.vertical), spinbutton.error:focus-within:not(.vertical),
entry.error:focus { entry.error:focus-within {
border-color: #410512; } border-color: #410512; }
spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical), spinbutton.error:selected:focus:not(.vertical), spinbutton.error:selected:not(.vertical),
entry.error:selected:focus, entry.error:selected:focus,
@@ -1737,8 +1737,8 @@ spinbutton:not(.vertical), entry {
background-color: #181b28; background-color: #181b28;
color: #cc5500; color: #cc5500;
border-color: #1a0b00; } border-color: #1a0b00; }
spinbutton.warning:focus:not(.vertical), spinbutton.warning:focus-within:not(.vertical),
entry.warning:focus { entry.warning:focus-within {
border-color: #1a0b00; } border-color: #1a0b00; }
spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical), spinbutton.warning:selected:focus:not(.vertical), spinbutton.warning:selected:not(.vertical),
entry.warning:selected:focus, entry.warning:selected:focus,
@@ -1756,8 +1756,8 @@ spinbutton:not(.vertical), entry {
spinbutton:not(.vertical) image:backdrop, spinbutton:not(.vertical) image:backdrop,
entry image:backdrop { entry image:backdrop {
color: #5c5f6b; } color: #5c5f6b; }
spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), spinbutton:drop(active):focus-within:not(.vertical), spinbutton:drop(active):not(.vertical),
entry:drop(active):focus, entry:drop(active):focus-within,
entry:drop(active) { entry:drop(active) {
border-color: #71f79f; border-color: #71f79f;
box-shadow: inset 0 0 0 1px #71f79f; } box-shadow: inset 0 0 0 1px #71f79f; }
@@ -1769,8 +1769,8 @@ spinbutton:not(.vertical), entry {
box-shadow: none; box-shadow: none;
text-shadow: 0 1px black; text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black; } -gtk-icon-shadow: 0 1px black; }
.osd spinbutton:focus:not(.vertical), .osd spinbutton:focus-within:not(.vertical),
.osd entry:focus { .osd entry:focus-within {
color: white; color: white;
border-color: #c50ed2; border-color: #c50ed2;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
@@ -1808,16 +1808,16 @@ entry progress {
spinbutton:not(.vertical) progress:backdrop, spinbutton:not(.vertical) progress:backdrop,
entry progress:backdrop { entry progress:backdrop {
background-color: transparent; } background-color: transparent; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) >
entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus-within + spinbutton:not(.vertical), .linked:not(.vertical) >
entry:focus + button, .linked:not(.vertical) > entry:focus-within + button, .linked:not(.vertical) >
entry:focus + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry:focus-within + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:focus-within:not(.vertical) +
entry, .linked:not(.vertical) > entry, .linked:not(.vertical) >
entry:focus + entry:focus-within +
entry { entry {
border-left-color: #980ba2; } border-left-color: #980ba2; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical), .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:focus-within:not(.vertical), .linked:not(.vertical) >
entry:focus { entry:focus-within {
border-color: #980ba2; } border-color: #980ba2; }
.linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) > .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + button, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + combobox > box > button.combo, .linked:not(.vertical) >
entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:drop(active) + spinbutton:not(.vertical), .linked:not(.vertical) >
@@ -1878,14 +1878,14 @@ entry:drop(active):not(:only-child) + button,
entry:drop(active):not(:only-child) + combobox > box > button.combo { entry:drop(active):not(:only-child) + combobox > box > button.combo {
border-top-color: #71f79f; } border-top-color: #71f79f; }
treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { treeview entry:focus-within:dir(rtl), treeview entry:focus-within:dir(ltr) {
background-color: #181b28; background-color: #181b28;
transition-property: color, background; } transition-property: color, background; }
treeview entry.flat, treeview entry { treeview entry.flat, treeview entry {
border-radius: 0; border-radius: 0;
background-image: none; background-image: none;
background-color: #181b28; } background-color: #181b28; }
treeview entry.flat:focus, treeview entry:focus { treeview entry.flat:focus-within, treeview entry:focus-within {
border-color: #c50ed2; } border-color: #c50ed2; }
/************* /*************

355
gtk-4.0/widgets/_entries.scss
View File

@@ -2,180 +2,181 @@
* Text Entries * * Text Entries *
****************/ ****************/
%entry, %entry,
entry { entry {
%entry_basic, & { %entry_basic, & {
min-height: 28px; min-height: 28px;
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
border: 1px solid; border: 1px solid;
border-radius: 3px; border-radius: 3px;
transition: all 200ms $ease-out-quad; transition: all 200ms $ease-out-quad;
@include entry(normal); @include entry(normal);
image { // icons inside the entry image { // icons inside the entry
&.left { padding-left: 0; padding-right: 6px; } &.left { padding-left: 0; padding-right: 6px; }
&.right { padding-left: 6px; padding-right: 0; } &.right { padding-left: 6px; padding-right: 0; }
} }
undershoot { undershoot {
&.left { @include undershoot(left); } &.left { @include undershoot(left); }
&.right { @include undershoot(right); } &.right { @include undershoot(right); }
} }
&.flat { &.flat {
&:focus, & { &:focus-within, & {
min-height: 0; min-height: 0;
padding: 2px; padding: 2px;
background-image: none; background-image: none;
border-color: transparent; border-color: transparent;
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
} }
} }
&:focus { @include entry(focus); } &:focus-within { @include entry(focus); }
&:disabled { @include entry(insensitive); } &:disabled { @include entry(insensitive); }
&:backdrop { &:backdrop {
@include entry(backdrop); @include entry(backdrop);
transition: $backdrop_transition; transition: $backdrop_transition;
} }
&:backdrop:disabled { @include entry(backdrop-insensitive); } &:backdrop:disabled { @include entry(backdrop-insensitive); }
selection { &:focus, & { @extend %selected_items; }} selection { &:focus, & { @extend %selected_items; }}
// entry error and warning style // entry error and warning style
@each $e_type, $e_color in (error, $error_color), @each $e_type, $e_color in (error, $error_color),
(warning, $warning_color) { (warning, $warning_color) {
&.#{$e_type} { &.#{$e_type} {
@include entry(normal); @include entry(normal);
color: $e_color; color: $e_color;
border-color: entry_focus_border($e_color); border-color: entry_focus_border($e_color);
&:focus { @include entry(focus, $e_color); } &:focus-within { @include entry(focus, $e_color); }
&:selected { &:focus, & { background-color: $e_color; }} &:selected { &:focus, & { background-color: $e_color; }}
} }
} }
& image { // entry icons colors & image { // entry icons colors
color: mix($fg_color, $base_color, 80%); color: mix($fg_color, $base_color, 80%);
&:hover { color: $fg_color; } &:hover { color: $fg_color; }
&:active { color: $selected_bg_color; } &:active { color: $selected_bg_color; }
&:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); } &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); }
} }
&:drop(active) { &:drop(active) {
&:focus, & { &:focus-within, & {
border-color: $drop_target_color; border-color: $drop_target_color;
box-shadow: inset 0 0 0 1px $drop_target_color; box-shadow: inset 0 0 0 1px $drop_target_color;
} }
} }
.osd & { .osd & {
@include entry(osd); @include entry(osd);
&:focus { @include entry(osd-focus); } &:focus-within { @include entry(osd-focus); }
&:backdrop { @include entry(osd-backdrop); } &:backdrop { @include entry(osd-backdrop); }
&:disabled { @include entry(osd-insensitive); } &:disabled { @include entry(osd-insensitive); }
} }
} }
progress { progress {
margin: 2px -6px; margin: 2px -6px;
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
border-radius: 0; border-radius: 0;
border-width: 0 0 2px; border-width: 0 0 2px;
border-color: $selected_bg_color; border-color: $selected_bg_color;
border-style: solid; border-style: solid;
box-shadow: none; box-shadow: none;
&:backdrop { background-color: transparent; } &:backdrop { background-color: transparent; }
} }
// linked entries // linked entries
.linked:not(.vertical) > & { @extend %linked; } .linked:not(.vertical) > & { @extend %linked; }
.linked:not(.vertical) > &:focus + &, .linked:not(.vertical) > &:focus-within + &,
.linked:not(.vertical) > &:focus + button, .linked:not(.vertical) > &:focus-within + button,
.linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: entry_focus_border(); } .linked:not(.vertical) > &:focus-within + combobox > box > button.combo { border-left-color: entry_focus_border(); }
.linked:not(.vertical) > &:focus { border-color: entry_focus_border(); } .linked:not(.vertical) > &:focus-within { border-color: entry_focus_border(); }
.linked:not(.vertical) > &:drop(active) + &, .linked:not(.vertical) > &:drop(active) + &,
.linked:not(.vertical) > &:drop(active) + button, .linked:not(.vertical) > &:drop(active) + button,
.linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; } .linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
// Vertically linked entries // Vertically linked entries
// FIXME: take care of "colored" entries // FIXME: take care of "colored" entries
.linked.vertical > & { .linked.vertical > & {
@extend %linked_vertical; @extend %linked_vertical;
// brighter border between linked entries // brighter border between linked entries
&:not(:disabled) + entry:not(:disabled), &:not(:disabled) + entry:not(:disabled),
&:not(:disabled) + %entry:not(:disabled) { &:not(:disabled) + %entry:not(:disabled) {
border-top-color: mix($borders_color, $base_color, 30%); border-top-color: mix($borders_color, $base_color, 30%);
background-image: linear-gradient(to bottom, $base_color, $base_color); background-image: linear-gradient(to bottom, $base_color, $base_color);
&:backdrop { &:backdrop {
border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%);
background-image: linear-gradient(to bottom, $backdrop_base_color, $backdrop_base_color); background-image: linear-gradient(to bottom, $backdrop_base_color, $backdrop_base_color);
} }
} }
// brighter border between linked insensitive entries // brighter border between linked insensitive entries
&:disabled + %entry:disabled, &:disabled + %entry:disabled,
&:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); } &:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); }
// color back the top border of a linked focused entry following another entry and add back the focus shadow. // color back the top border of a linked focused entry following another entry and add back the focus shadow.
// :not(:only-child) is a specificity bump hack. // :not(:only-child) is a specificity bump hack.
+ %entry:focus:not(:only-child), + %entry:focus:not(:only-child),
+ entry:focus:not(:only-child) { border-top-color: entry_focus_border(); } + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
+ %entry:drop(active):not(:only-child), + %entry:drop(active):not(:only-child),
+ entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; } + entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
// this takes care of coloring the top border of the focused entry subsequent widget. // this takes care of coloring the top border of the focused entry subsequent widget.
// :not(:only-child) is a specificity bump hack. // :not(:only-child) is a specificity bump hack.
&:focus:not(:only-child) { &:focus:not(:only-child) {
+ %entry, + %entry,
+ entry, + entry,
+ button, + button,
+ combobox > box > button.combo { border-top-color: entry_focus_border(); } + combobox > box > button.combo { border-top-color: entry_focus_border(); }
} }
&:drop(active):not(:only-child) { &:drop(active):not(:only-child) {
+ %entry, + %entry,
+ entry, + entry,
+ button, + button,
+ combobox > box > button.combo { border-top-color: $drop_target_color; } + combobox > box > button.combo { border-top-color: $drop_target_color; }
} }
} }
} }
treeview entry { treeview entry {
&:focus { &:focus-within {
&:dir(rtl), &:dir(ltr) { // specificity bump hack &:dir(rtl), &:dir(ltr) { // specificity bump hack
background-color: $base_color; background-color: $base_color;
transition-property: color, background; transition-property: color, background;
} }
} }
&.flat, & { &.flat, & {
border-radius: 0; border-radius: 0;
background-image: none; background-image: none;
background-color: $base_color; background-color: $base_color;
&:focus { border-color: $selected_bg_color; } &:focus-within { border-color: $selected_bg_color; }
} }
} }