mirrors/Simplewaita
1
0
Fork 0
mirror of https://git.disroot.org/eudaimon/Simplewaita.git synced 2026-03-10 04:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed (made effectless) focus-ring() on gtk4; improved focus aspect for every item, in gtk3 too.

Browse source
This commit is contained in:
Néstor Andreu 2023-06-14 19:41:24 +02:00
parent 7c09d3f566
commit 1f8b497765
6 changed files with 94 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

31
source/gtk4/_common.scss
View file

@ -454,7 +454,7 @@ button {
@include focus-ring();
&:hover {
&:hover, &:focus {
@include button(hover);
-gtk-icon-filter: brightness(1.2);
}
@ -466,7 +466,7 @@ button {
transition-duration: 50ms;
}
&:checked:hover:not(:active) { @include button(checked-hover); }
&:checked:hover:not(:active), &:checked:focus:not(:active) { @include button(checked-hover); }
&:checked, &:checked:active { @include button(checked-active); }
//removed backdrop
@ -581,7 +581,7 @@ button {
//border: none;
box-shadow: none;
&:hover {
&:hover, &:focus {
@include button(osd-hover);
//border: none;
@ -602,7 +602,7 @@ button {
.osd & {
@include button(normal, $osd_bg_color, $osd_fg_color);
&:hover { @include button(hover, $osd_bg_color, $osd_fg_color); }
&:hover, &:focus { @include button(hover, $osd_bg_color, $osd_fg_color); }
&:active,
&:checked { @include button(active, $osd_bg_color, $osd_fg_color); }
@ -615,7 +615,7 @@ button {
//box-shadow: none;
//-gtk-icon-shadow: 0 1px black;
&:hover { @include button(hover, $osd_bg_color, $osd_fg_color); }
&:hover, &:focus { @include button(hover, $osd_bg_color, $osd_fg_color); }
&:disabled {
@include button(insensitive);
@ -642,7 +642,7 @@ button {
color: $b_color; //FIXME: does it work on the dark variant?
}
&:hover { @include button(hover, $b_color, white); }
&:hover, &:focus { @include button(hover, $b_color, white); }
&:active,
&:checked { @include button(active, $b_color, white); }
@ -665,7 +665,7 @@ button {
.osd & {
@include button(osd, $b_color);
&:hover { @include button(osd-hover, $b_color); }
&:hover, &:focus { @include button(osd-hover, $b_color); }
&:active,
&:checked { @include button(osd-active, $b_color);}
@ -828,8 +828,10 @@ modelbutton.flat {
&:not(:hover):not(:active):not(:checked):not(:disabled) {@extend %undecorated_button;}
//&:hover { background-color: $menu_selected_color; }
&:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@include button(hover);//, $backimage: $_border_bg);
&:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop),
&:focus:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
//@include button(hover);//, $backimage: $_border_bg);
@extend %selected_items;
}
&:disabled {
@ -1839,7 +1841,7 @@ popover.menu {
padding: 0 $_menu-padding;
button.image-button.model {
@include button(undecorated);
@include button(normal);
min-height: 30px;
min-width: 30px;
@ -1848,7 +1850,7 @@ popover.menu {
outline: none;
transition: none;
&:selected { background: image($menu_selected_color); }
&:selected { @include button(checked); }
}
}
@ -1860,8 +1862,9 @@ popover.menu {
padding: 11px;
&:focus {
background-color: $menu_selected_color;
border-color: $menu_selected_color;
//background-color: $menu_selected_color;
//border-color: $menu_selected_color;
@include button(hover);
}
}
}
@ -2173,6 +2176,7 @@ radio {
@each $state, $t in ("", "normal"),
(":hover", "hover"),
(":focus", "hover"),
(":active", "active"),
(":disabled", "insensitive") {
&#{$state} {
@ -2187,6 +2191,7 @@ radio {
&#{$t} {
@each $state, $t in ("", "normal"),
(":hover", "hover"),
(":focus", "hover"),
(":active", "active"),
(":disabled", "insensitive") {
&#{$state} {