Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto update new upstream snapshot for GNOME Shell #4095

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Auto update new upstream snapshot for GNOME Shell #4095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// global colors
$base_color: if($variant == 'light', $light_1, $_base_color_dark);
$bg_color: if($variant == 'light', $_base_color_light, lighten($base_color, 5%));
$bg_color: if($variant == 'light', $_base_color_light, #36363a);
$fg_color: if($variant == 'light', $_base_color_dark, $light_1);

// OSD elements
Expand Down Expand Up @@ -66,4 +66,4 @@ $active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_colo
$active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_color, 12%));

// accent colors
$accent_borders_color: if($variant== 'light', st-darken(-st-accent-color, 15%), st-lighten(-st-accent-color, 15%));
$accent_borders_color: if($variant== 'light', st-darken(-st-accent-color, 20%), st-lighten(-st-accent-color, 30%));
19 changes: 10 additions & 9 deletions gnome-shell/upstream/theme/gnome-shell-sass/_default-colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// Named Colors

// base colors
$_base_color_dark: desaturate($dark_4, 100%);
$_base_color_light: desaturate($light_2, 100%);
$_base_color_dark: #222226;
$_base_color_light: #fafafb;

// accent colors
$accent_color: if($variant== 'light', -st-accent-color, st-mix(-st-accent-color, $light_1, 60%));

// colors for destructive elements
$destructive_bg_color: if($variant == 'light', $red_3, $red_4);
Expand All @@ -14,7 +17,7 @@ $success_bg_color: if($variant == 'light', $green_4, $green_5);
$success_fg_color: $light_1;
$success_color: $success_bg_color;

$warning_bg_color: if($variant == 'light', $yellow_4, $yellow_3);
$warning_bg_color: if($variant == 'light', $yellow_5, #cd9309); // uses darker off-palette yellow
$warning_fg_color: transparentize(black, .2);
$warning_color: $warning_bg_color;

Expand All @@ -28,23 +31,21 @@ $link_visited_color: st-transparentize($link_color, .6);

// special cased widget definitions
$background_mix_factor: if($variant == 'light', 12%, 9%); // used to boost the color of backgrounds in different variants
$border_opacity: if($variant == 'light', .85, .9); // change the border opacity in different variants

// shadows
$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2));
$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));

// focus colors
$focus_color: -st-accent-color;
$focus_border_color: st-transparentize($focus_color, 0.5);
// border opacities
$border_opacity: if($variant == 'light', .85, .9); // change the border opacity in different variants
$focus_border_opacity: .2;

// High Contrast overrides
@if $contrast == 'high' {
// increase border opacity
$border_opacity: .5;
$focus_border_opacity: .1;
// remove shadows
$shadow_color: transparent;
$text_shadow_color: transparent;
// less transparent focus color
$focus_border_color: st-transparentize($focus_color, 0.2);
}
36 changes: 17 additions & 19 deletions gnome-shell/upstream/theme/gnome-shell-sass/_drawing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

// Function to mix the color and make the focus background
@function focus_bg_color($bg, $fc:$focus_color) {
@function focus_bg_color($bg, $fc:$accent_color) {
@return st-mix($fc, $bg, 5%);
}

Expand Down Expand Up @@ -54,10 +54,13 @@
}

// Draw the focus ring
@mixin focus_ring($width: 2px, $fc: $focus_border_color, $border: false) {
box-shadow: inset 0 0 0 $width $fc !important;
@mixin focus_ring($width: 2px, $fc: $accent_color, $border: false) {

$focus_color: st-transparentize($fc, $focus_border_opacity);

box-shadow: inset 0 0 0 $width $focus_color !important;
@if $border {
border:$width solid $fc !important;
border:$width solid $focus_color !important;
box-shadow: none;
}
}
Expand Down Expand Up @@ -90,7 +93,7 @@
// entry colors
$entry_fg_color: $c;
$entry_bg_color: mix($c, $bc, $background_mix_factor);
$entry_focus_color: $focus_color;
$entry_focus_color: $accent_color;

// entry color overrides for lockscreen style
@if $style == 'lockscreen' {
Expand Down Expand Up @@ -128,7 +131,7 @@

// focus styles
@if $type == 'focus' {
@include focus_ring();
@include focus_ring($fc:$entry_focus_color);
background-color: focus_bg_color($entry_bg_color);
color: $entry_fg_color;

Expand Down Expand Up @@ -357,6 +360,9 @@
&:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);}
} @else {
@include button(normal, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);
// override the mixin to have the flat button always be transparent
// fixes issue with overlapping tiles
background-color: transparent;
&:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
Expand All @@ -372,23 +378,15 @@
}

// styling for all menuitems in popovers
@mixin menuitem($bg, $style: flat) {
@mixin menuitem($bg) {

// extend common styles
@extend %menuitem;

@if $style == 'flat' {
@include button(undecorated);
} @else {
@include button(normal, $c:$bg);
}
&:hover {
@include button(hover, $c:$bg);
}
&:active {@include button(active, $c:$bg);}
&:selected,
&:checked {@include button(checked, $c:$bg);}
&:insensitive {@include button(insensitive, $c:$bg);}
@include button(undecorated, $c:$bg, $style: flat);
&:active { @include button(active, $c:$bg, $style: flat);}
&:hover, &:selected, &:checked { @include button(hover, $c:$bg, $style: flat);}
&:insensitive { @include button(insensitive, $c:$bg, $style: flat);}
}

// Panel menu/button drawing function
Expand Down
Loading