mirror of
https://github.com/edu4rdshl/gnome-shell.git
synced 2026-07-17 23:24:51 +00:00
theme: Papercut fixes from 42 refresh
- simplified drawing functions - refactored button drawing - dropped arrow from all popovers - cleaned out some legacy css - fixed many of the issues in #4969 Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2150>
This commit is contained in:
parent
b2fa3ad98f
commit
4de96ac737
24 changed files with 285 additions and 314 deletions
|
|
@ -32,12 +32,6 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
|
|||
// the keys
|
||||
.keyboard-key {
|
||||
|
||||
@include button(normal, $c:$key_bg_color, $tc:$osd_fg_color);
|
||||
|
||||
&:focus { @include button(focus);}
|
||||
&:hover, &:checked { @include button(hover, $c: $key_bg_color, $tc:$osd_fg_color);}
|
||||
&:active { @include button(active, $c: $key_bg_color, $tc:$osd_fg_color); }
|
||||
|
||||
@include fontsize($base_font_size + 5);
|
||||
font-weight: bold;
|
||||
min-height: $key_size;
|
||||
|
|
@ -45,6 +39,13 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
|
|||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-radius: $key_border_radius;
|
||||
box-shadow: 0 1px 0 0 $shadow_color;
|
||||
|
||||
@include keyboard_key(normal, $key_bg_color, $osd_fg_color);
|
||||
|
||||
&:focus { @include keyboard_key(focus);}
|
||||
&:hover, &:checked { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
|
||||
&:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
|
||||
|
||||
&:grayed { //FIXMEy
|
||||
background-color: darken($bg_color, 3%);
|
||||
|
|
@ -54,17 +55,17 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
|
|||
|
||||
// non-character keys
|
||||
&.default-key {
|
||||
@include button(normal, $c:$default_key_bg_color, $tc:$osd_fg_color);
|
||||
&:hover, &:checked {@include button(hover, $c: $default_key_bg_color, $tc:$osd_fg_color);}
|
||||
&:active { @include button(active, $c: $default_key_bg_color, $tc:$osd_fg_color);}
|
||||
@include keyboard_key(normal, $default_key_bg_color, $osd_fg_color);
|
||||
&:hover, &:checked {@include keyboard_key(hover, $default_key_bg_color, $osd_fg_color);}
|
||||
&:active { @include keyboard_key(active, $default_key_bg_color, $osd_fg_color);}
|
||||
border-radius: $key_border_radius;
|
||||
}
|
||||
|
||||
// enter key is suggested-action
|
||||
&.enter-key {
|
||||
@include button(normal, $c:$selected_bg_color, $tc:$selected_fg_color);
|
||||
&:hover, &:checked { @include button(hover, $c: lighten($selected_bg_color, 3%), $tc:$selected_fg_color);}
|
||||
&:active {@include button(active, $c: darken($selected_bg_color, 2%), $tc:$selected_fg_color);}
|
||||
@include keyboard_key(normal, $selected_bg_color, $selected_fg_color);
|
||||
&:hover, &:checked { @include keyboard_key(hover, lighten($selected_bg_color, 3%), $selected_fg_color);}
|
||||
&:active {@include keyboard_key(active, darken($selected_bg_color, 2%), $selected_fg_color);}
|
||||
border-radius: $key_border_radius;
|
||||
color: $osd_fg_color;
|
||||
}
|
||||
|
|
@ -97,11 +98,11 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
|
|||
padding: $base_padding;
|
||||
|
||||
.keyboard-key {
|
||||
@include button(normal, $c:$key_bg_color, $tc:$osd_fg_color);
|
||||
@include keyboard_key(normal, $key_bg_color, $osd_fg_color);
|
||||
|
||||
&:focus { @include button(focus);}
|
||||
&:hover, &:checked { @include button(hover, $c: $key_bg_color, $tc:$osd_fg_color);}
|
||||
&:active { @include button(active, $c: $key_bg_color, $tc:$osd_fg_color); }
|
||||
&:focus { @include keyboard_key(focus);}
|
||||
&:hover, &:checked { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
|
||||
&:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
|
||||
|
||||
border-radius:$key_border_radius;
|
||||
}
|
||||
|
|
@ -138,10 +139,10 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken(
|
|||
border-radius: $base_border_radius - 2px;
|
||||
padding: $base_padding $base_padding*3;
|
||||
|
||||
@include button(undecorated, $c:$key_bg_color, $tc:$osd_fg_color);
|
||||
@include keyboard_key(undecorated, $key_bg_color, $osd_fg_color);
|
||||
|
||||
&:focus { @include button(focus);}
|
||||
&:hover, &:checked { @include button(hover, $c: $key_bg_color, $tc:$osd_fg_color);}
|
||||
&:active { @include button(active, $c: $key_bg_color, $tc:$osd_fg_color); }
|
||||
&:focus { @include keyboard_key(focus);}
|
||||
&:hover, &:checked { @include keyboard_key(hover, $key_bg_color, $osd_fg_color);}
|
||||
&:active { @include keyboard_key(active, $key_bg_color, $osd_fg_color); }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue