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

42
gtk-4.0/gtk.css
View File

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

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

@@ -2,8 +2,8 @@
* Text Entries *
****************/
%entry,
entry {
%entry,
entry {
%entry_basic, & {
min-height: 28px;
padding-left: 8px;
@@ -25,7 +25,7 @@ entry {
}
&.flat {
&:focus, & {
&:focus-within, & {
min-height: 0;
padding: 2px;
background-image: none;
@@ -35,7 +35,7 @@ entry {
}
}
&:focus { @include entry(focus); }
&:focus-within { @include entry(focus); }
&:disabled { @include entry(insensitive); }
@@ -57,7 +57,7 @@ entry {
color: $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; }}
}
@@ -74,7 +74,7 @@ entry {
}
&:drop(active) {
&:focus, & {
&:focus-within, & {
border-color: $drop_target_color;
box-shadow: inset 0 0 0 1px $drop_target_color;
}
@@ -83,7 +83,7 @@ entry {
.osd & {
@include entry(osd);
&:focus { @include entry(osd-focus); }
&:focus-within { @include entry(osd-focus); }
&:backdrop { @include entry(osd-backdrop); }
@@ -106,11 +106,11 @@ entry {
// linked entries
.linked:not(.vertical) > & { @extend %linked; }
.linked:not(.vertical) > &:focus + &,
.linked:not(.vertical) > &:focus + button,
.linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: entry_focus_border(); }
.linked:not(.vertical) > &:focus-within + &,
.linked:not(.vertical) > &:focus-within + button,
.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) + button,
@@ -161,10 +161,10 @@ entry {
+ combobox > box > button.combo { border-top-color: $drop_target_color; }
}
}
}
}
treeview entry {
&:focus {
treeview entry {
&:focus-within {
&:dir(rtl), &:dir(ltr) { // specificity bump hack
background-color: $base_color;
transition-property: color, background;
@@ -176,6 +176,7 @@ treeview entry {
background-image: none;
background-color: $base_color;
&:focus { border-color: $selected_bg_color; }
&:focus-within { border-color: $selected_bg_color; }
}
}
}