Skip to content
Commits on Source (35)
Expand all Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ aa9a1b85
......@@ -252,6 +252,7 @@ flatpak:
FLATPAK_MODULE: "gnome-extensions-app"
APP_ID: "org.gnome.Extensions.Devel"
extends: .flatpak
allow_failure: true
nightly:
extends: '.publish_nightly'
......
.gitlab-ci/checkout-mutter.sh
View file @ aa9a1b85
......@@ -47,9 +47,23 @@ if [ -z "$mutter_target" ]; then
mutter_target=FETCH_HEAD
else
echo \ not found
mutter_target=HEAD
echo Using $mutter_target instead
fi
fi
fallback_branch=${CI_COMMIT_TAG:+gnome-}${CI_COMMIT_TAG%%.*}
if [ -z "$mutter_target" -a "$fallback_branch" ]; then
echo -n Looking for $fallback_branch instead ...
if fetch origin $fallback_branch; then
echo \ found
mutter_target=FETCH_HEAD
else
echo \ not found
fi
fi
if [ -z "$mutter_target" ]; then
mutter_target=HEAD
echo Using $mutter_target instead
fi
git checkout -q $mutter_target
NEWS
View file @ aa9a1b85
42.3.1
======
* Fix regression in ibus support [Florian; !2359]
* Make sure screenshot UI opens above dialogs [Alynx; !2331]
* Misc. bug fixes and cleanups [Florian; !2293]
Contributors:
Florian Müllner, Alynx Zhou
Translators:
Vojtěch Perník [cs]
42.3
====
* Fix feedback when turning on a11y features by keyboard [Olivier; !2334]
* Fix OSD colors with light stylesheet [Jakub; !2315]
* Only close messages via delete key if they can be closed [PhilProg; !2323]
* Fix screenshots when XDG directories are disabled [Sam; !2327]
* Do not create systemd scope for D-Bus activated apps [msizanoen1; !2305]
* Improve high-contrast stylesheet [Sam; !2284]
* Hide overview after 'Show Details' from app context menu [PhilProg; !2329]
* Fix stylesheet papercuts [Sam; !2309]
* Respect IM hint for candidates list in on-screen keyboard [Carlos; !2347]
* Fix edge case where windows stay dimmed after a modal is closed [Jonas; !2349]
* Improve Belgian on-screen keyboard layout [Evert; !2336]
* Fix fallback ibus-daemon launching [oreo639; !2345]
* Misc. bug fixes [Sebastian, Florian; !2319, !2355]
Contributors:
Jonas Dreßler, Olivier Fourdan, Carlos Garnacho, Sam Hewitt, Sebastian Keller,
Florian Müllner, PhilProg, Evert Provoost, Jakub Steiner, Sam Uong,
msizanoen1, oreo639
Translators:
Milo Casagrande [it], Jordi Mas [ca]
42.2
====
* Align space-padded times in world clocks [Maksym; !2294]
......
data/osk-layouts/be.json
View file @ aa9a1b85
......@@ -6,10 +6,18 @@
"rows": [
[
[
"q"
"a",
"á",
"ä",
"â",
"à",
"æ",
"ã",
"å",
"ā"
],
[
"w"
"z"
],
[
"e",
......@@ -29,6 +37,7 @@
],
[
"y",
"ÿ",
"ij"
],
[
......@@ -66,18 +75,11 @@
],
[
[
"a",
"á",
"ä",
"â",
"à",
"æ",
"ã",
"å",
"ā"
"q"
],
[
"s"
"s",
"ß"
],
[
"d"
......@@ -99,17 +101,23 @@
],
[
"l"
],
[
"m"
]
],
[
[
"z"
"w"
],
[
"x"
],
[
"c"
"c",
"ç",
"ć",
"č"
],
[
"v"
......@@ -123,7 +131,11 @@
"ń"
],
[
"m"
"'",
"‘",
"’",
"‹",
"›"
]
],
[
......@@ -153,10 +165,18 @@
"rows": [
[
[
"Q"
"A",
"Á",
"Ä",
"Â",
"À",
"Æ",
"Ã",
"Å",
"Ā"
],
[
"W"
"Z"
],
[
"E",
......@@ -176,6 +196,7 @@
],
[
"Y",
"Ÿ",
"IJ"
],
[
......@@ -213,18 +234,11 @@
],
[
[
"A",
"Á",
"Ä",
"Â",
"À",
"Æ",
"Ã",
"Å",
"Ā"
"Q"
],
[
"S"
"S",
"ẞ"
],
[
"D"
......@@ -246,17 +260,23 @@
],
[
"L"
],
[
"M"
]
],
[
[
"Z"
"W"
],
[
"X"
],
[
"C"
"C",
"Ç",
"Ć",
"Č"
],
[
"V"
......@@ -270,7 +290,11 @@
"Ń"
],
[
"M"
"'",
"‘",
"’",
"‹",
"›"
]
],
[
......@@ -581,4 +605,4 @@
],
"locale": "nl-BE",
"name": "Dutch (Belgium)"
}
\ No newline at end of file
}
data/theme/gnome-shell-high-contrast.css
View file @ aa9a1b85
This diff is collapsed.
data/theme/gnome-shell-sass/_colors.scss
View file @ aa9a1b85
// When color definition differs for dark and light variant,
// it gets @if-ed depending on $variant
//GNOME Color Palette
$blue_1: #99c1f1;
$blue_2: #62a0ea;
$blue_3: #3584e4;
$blue_4: #1c71d8;
$blue_5: #1a5fb4;
$green_1: #8ff0a4;
$green_2: #57e389;
$green_3: #33d17a;
$green_4: #2ec27e;
$green_5: #26a269;
$yellow_1: #f9f06b;
$yellow_2: #f8e45c;
$yellow_3: #f6d32d;
$yellow_4: #f5c211;
$yellow_5: #e5a50a;
$orange_1: #ffbe6f;
$orange_2: #ffa348;
$orange_3: #ff7800;
$orange_4: #e66100;
$orange_5: #c64600;
$red_1: #f66151;
$red_2: #ed333b;
$red_3: #e01b24;
$red_4: #c01c28;
$red_5: #a51d2d;
$purple_1: #dc8add;
$purple_2: #c061cb;
$purple_3: #9141ac;
$purple_4: #813d9c;
$purple_5: #613583;
$brown_1: #cdab8f;
$brown_2: #b5835a;
$brown_3: #986a44;
$brown_4: #865e3c;
$brown_5: #63452c;
$light_1: #ffffff;
$light_2: #f6f5f4;
$light_3: #deddda;
$light_4: #c0bfbc;
$light_5: #9a9996;
$dark_1: #77767b;
$dark_2: #5e5c64;
$dark_3: #3d3846;
$dark_4: #241f31;
$dark_5: #000000;
$base_color: if($variant == 'light', #fff, darken(desaturate(#241f31, 100%), 2%));
@import '_palette.scss';
$_dark_base_color: darken(desaturate(#241f31, 100%), 2%);
$base_color: if($variant == 'light', #fff, $_dark_base_color);
$bg_color: if($variant == 'light', #f6f5f4, lighten($base_color, 5%));
$fg_color: if($variant == 'light', transparentize(black, .2), white);
......@@ -69,7 +25,7 @@ $success_color: if($variant == 'light', $green_4, $green_5);
$destructive_color: $error_color;
$osd_fg_color: white;
$osd_bg_color: transparentize(desaturate($bg_color, 100%),0.04);
$osd_bg_color: $_dark_base_color; //hardcoded for both light & dark
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
$osd_insensitive_fg_color: if($variant == 'light', mix($osd_fg_color, $osd_bg_color, 80%), mix($osd_fg_color, $osd_bg_color, 70%));
$osd_borders_color: transparentize(black, 0.3);
......@@ -77,6 +33,12 @@ $osd_outer_borders_color: transparentize($osd_fg_color, 0.98);
$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
// cards
$card_bg_color: if($variant == 'light', darken($bg_color, 5%), lighten($bg_color, 2%));
// notifications
$bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 10%));
// overview background color
$system_bg_color: $base_color;
......@@ -92,3 +54,16 @@ $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
// derived hover colors
$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 10%));
$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 10%));
// derived active colors
$active_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 12%));
$active_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 12%));
// derived checked colors
$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 15%));
$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 15%));
\ No newline at end of file
data/theme/gnome-shell-sass/_common.scss
View file @ aa9a1b85
......@@ -35,18 +35,6 @@ $base_border_radius: 8px;
// radii of things that display over other things, e.g. popovers
$modal_radius: $base_border_radius*2; // 24px
// derived hover colors
$hover_bg_color: if($variant=='light', darken($bg_color, 3%), lighten($bg_color, 4%));
$hover_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 4%));
// derived active colors
$active_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 6%));
$active_fg_color: if($variant=='light', darken($fg_color, 5%), lighten($fg_color, 6%));
// derived checked colors
$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 9%));
$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 9%));
// fonts
$base_font_size: 11;
$text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
......@@ -86,7 +74,7 @@ stage {
padding: $base_padding;
spacing: $base_padding;
border: 2px solid transparent;
transition-duration: 100ms;
transition-duration: 200ms;
text-align: center;
}
......@@ -118,7 +106,6 @@ stage {
// lighter in color and have a greater radius
$bubble_button_radius:$base_border_radius*1.25;
$bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 7%));
%bubble_button {
padding: $base_padding * 2;
......@@ -163,11 +150,11 @@ $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($
// that are undecorated by default and use OSD colors
%osd_button {
@include button(undecorated);
&:insensitive { @include button(undecorated, $c:$osd_bg_color);}
&:focus { @include button(focus, $c:$osd_bg_color);}
&:hover { @include button(hover, $c:$osd_bg_color);}
&:active { @include button(active, $c:$osd_bg_color);}
&:outlined,&:checked { @include button(checked, $c:$osd_bg_color);}
&:insensitive { @include button(undecorated, $tc:$osd_fg_color, $c:$osd_bg_color);}
&:focus { @include button(focus, $tc:$osd_fg_color, $c:$osd_bg_color);}
&:hover { @include button(hover, $tc:$osd_fg_color, $c:$osd_bg_color);}
&:active { @include button(active, $tc:$osd_fg_color, $c:$osd_bg_color);}
&:outlined,&:checked { @include button(checked, $tc:$osd_fg_color, $c:$osd_bg_color);}
}
/* General Typography */
......
data/theme/gnome-shell-sass/_drawing.scss
View file @ aa9a1b85
......@@ -129,13 +129,6 @@
}
}
// buttons
// since buttons are all flat an borderless now the mixin is simpler
@mixin button($t, $tc:$fg_color, $c:$bg_color) {
$button_bg_color: mix($tc, $c, 5%);
//
// Button drawing function
//
......@@ -148,6 +141,12 @@ $button_bg_color: mix($tc, $c, 5%);
// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
//
// since buttons are all flat an borderless now the mixin is simpler
@mixin button($t, $tc:$fg_color, $c:$bg_color) {
$button_bg_color: mix($tc, $c, 5%);
transition-duration: 100ms;
// normal button
@if $t==normal {
......@@ -258,6 +257,7 @@ $button_bg_color: mix($tc, $c, 5%);
// overview icon, dash, app grid
@mixin overview_icon($color, $flat: true) {
transition-duration: 400ms;
.overview-icon { @extend %tile; }
@if $flat {
.overview-icon { background-color: transparent;}
......@@ -289,24 +289,24 @@ $button_bg_color: mix($tc, $c, 5%);
@mixin card($flat: false) {
border-radius: $base_border_radius;
margin: $base_margin;
box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
box-shadow: 0 1px 1px 0 $shadow_color;
@if $flat {
@include button(undecorated);
box-shadow: none !important;
} @else {
@include button(normal);
@include button(normal, $c:$card_bg_color);
}
&:focus {
@include button(focus);
@include button(focus, $c:$card_bg_color);
}
&:hover {
@include button(hover);
@include button(hover, $c:$card_bg_color);
}
&:active {
@include button(active);
@include button(active, $c:$card_bg_color);
}
}
data/theme/gnome-shell-sass/_high-contrast-colors.scss
View file @ aa9a1b85
// When color definition differs for dark and light variant,
// it gets @if ed depending on $variant
$base_color: #222;
$bg_color: #000;
$fg_color: #fff;
@import '_palette.scss';
$base_color: if($variant == 'light', #fff, #000);
$bg_color: $base_color;
$fg_color: if($variant == 'light', transparentize(black, .2), white);
$selected_fg_color: #ffffff;
$selected_bg_color: darken(#4a90d9,20%);
$selected_bg_color: $blue_3;
$selected_borders_color: darken($selected_bg_color, 20%);
$borders_color: darken($bg_color,12%);
$borders_edge: transparentize($fg_color, 0.9);
$borders_color: lighten($bg_color,17%);
$borders_edge: $borders_color;
$link_color: lighten($selected_bg_color,20%);
$link_visited_color: lighten($selected_bg_color,10%);
$warning_color: #f57900;
$error_color: #cc0000;
$success_color: darken(#73d216,10%);
$destructive_color: darken(#ef2929,10%);
$warning_color: if($variant == 'light', $yellow_5, #cd9309);
$error_color: if($variant == 'light', $red_3, $red_4);
$success_color: if($variant == 'light', $green_4, $green_5);
$destructive_color: $error_color;
$osd_fg_color: #eeeeec;
$osd_bg_color: #2e3436;
$osd_borders_color: rgba(0,0,0, 0.7);
$osd_outer_borders_color: rgba(255,255,255, 0.1);
$osd_insensitive_bg_color: mix($osd_fg_color, $osd_bg_color, 10%);
$osd_fg_color: white;
$osd_bg_color: $base_color;
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
$osd_insensitive_fg_color: if($variant == 'light', mix($osd_fg_color, $osd_bg_color, 80%), mix($osd_fg_color, $osd_bg_color, 70%));
$osd_borders_color: $osd_bg_color;
$osd_outer_borders_color: $osd_bg_color;
$shadow_color: transparent;
// cards
$card_bg_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 12%));
$shadow_color: rgba(0,0,0, 0.1);
$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color
// notifications
$bubble_buttons_color: if($variant == 'light', darken($bg_color, 22%), lighten($bg_color, 31%));
// overview background color
$system_bg_color: lighten($base_color, 17%);
//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
......@@ -40,3 +51,15 @@ $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
$backdrop_insensitive_color: lighten($backdrop_bg_color,15%);
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
// derived hover colors
$hover_bg_color: if($variant=='light', darken($bg_color, 8%), lighten($bg_color, 20%));
$hover_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 20%));
// derived active colors
$active_bg_color: if($variant=='light', darken($bg_color, 10%), lighten($bg_color, 22%));
$active_fg_color: if($variant=='light', darken($fg_color, 10%), lighten($fg_color, 22%));
// derived checked colors
$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 25%));
$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 25%));
\ No newline at end of file
data/theme/gnome-shell-sass/_palette.scss 0 → 100644
View file @ aa9a1b85
//GNOME Color Palette
$blue_1: #99c1f1;
$blue_2: #62a0ea;
$blue_3: #3584e4;
$blue_4: #1c71d8;
$blue_5: #1a5fb4;
$green_1: #8ff0a4;
$green_2: #57e389;
$green_3: #33d17a;
$green_4: #2ec27e;
$green_5: #26a269;
$yellow_1: #f9f06b;
$yellow_2: #f8e45c;
$yellow_3: #f6d32d;
$yellow_4: #f5c211;
$yellow_5: #e5a50a;
$orange_1: #ffbe6f;
$orange_2: #ffa348;
$orange_3: #ff7800;
$orange_4: #e66100;
$orange_5: #c64600;
$red_1: #f66151;
$red_2: #ed333b;
$red_3: #e01b24;
$red_4: #c01c28;
$red_5: #a51d2d;
$purple_1: #dc8add;
$purple_2: #c061cb;
$purple_3: #9141ac;
$purple_4: #813d9c;
$purple_5: #613583;
$brown_1: #cdab8f;
$brown_2: #b5835a;
$brown_3: #986a44;
$brown_4: #865e3c;
$brown_5: #63452c;
$light_1: #ffffff;
$light_2: #f6f5f4;
$light_3: #deddda;
$light_4: #c0bfbc;
$light_5: #9a9996;
$dark_1: #77767b;
$dark_2: #5e5c64;
$dark_3: #3d3846;
$dark_4: #241f31;
$dark_5: #000000;
\ No newline at end of file
data/theme/gnome-shell-sass/widgets/_app-grid.scss
View file @ aa9a1b85
......@@ -102,6 +102,7 @@ $app_icon_size: 96px;
// App Grid pagination indicators
.page-indicator {
padding: $base_padding $base_padding * 2 0;
transition-duration:400ms;
.page-indicator-icon {
width: 10px;
......
data/theme/gnome-shell-sass/widgets/_calendar.scss
View file @ aa9a1b85
......@@ -69,6 +69,7 @@
height: $calendar_day_size !important;
width: $calendar_day_size !important;
border-radius: 99px;
transition-duration: 100ms;
@extend %numeric;
@extend %smaller;
......
data/theme/gnome-shell-sass/widgets/_login-dialog.scss
View file @ aa9a1b85
......@@ -16,7 +16,6 @@
.modal-dialog-button-box { spacing: 3px; }
.modal-dialog-button {
padding: 4px 18px;
box-shadow: 0 1px 3px rgba(0,0,0,0.2);
background-color: darken($system_bg_color, 3%);
border-color: darken($system_bg_color, 3%);
color: $osd_fg_color;
......@@ -28,7 +27,6 @@
}
&:active {
$_active_c: darken($_gdm_bg, 5%);
box-shadow: none;
background-color: $_active_c;
border-color: $_active_c;
}
......@@ -103,7 +101,6 @@
@include fontsize($base_font_size + 2);
font-weight: bold;
padding-left: 15px;
&:ltr { padding-left: 14px; text-align: left; }
&:rtl { padding-right: 14px; text-align: right; }
}
......
data/theme/gnome-shell-sass/widgets/_looking-glass.scss
View file @ aa9a1b85
......@@ -9,7 +9,7 @@
color: $osd_fg_color;
padding: $base_padding;
spacing: $base_padding;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
box-shadow: 0 2px 4px 0 $shadow_color;
& > #Toolbar {
border: none;
......
data/theme/gnome-shell-sass/widgets/_network-dialog.scss
View file @ aa9a1b85
......@@ -15,6 +15,10 @@
.nm-dialog-header-icon { icon-size: $large_icon_size;}
.nm-dialog-header-hbox { spacing: 10px; }
.nm-dialog-network-selected {
margin: 0 $base_margin*2;
}
.nm-dialog-scroll-view {
padding:$base_padding;
border-radius: $base_border_radius;
......
data/theme/gnome-shell-sass/widgets/_notifications.scss
View file @ aa9a1b85
......@@ -8,7 +8,7 @@ $notification_banner_radius: $base_border_radius*1.5;
.notification-banner {
min-height: $notification_banner_height;
width: $notification_banner_width;
box-shadow: 0 2px 4px 2px rgba(0,0,0,0.1);
box-shadow: 0 2px 4px 2px $shadow_color;
border-radius: $notification_banner_radius;
margin: $base_margin;
......
data/theme/gnome-shell-sass/widgets/_popovers.scss
View file @ aa9a1b85
......@@ -21,7 +21,7 @@
padding: $base_padding;
border-radius: $modal_radius - 2px;
border: 1px solid $borders_edge;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
box-shadow: 0 2px 4px 0 $shadow_color;
background-color: $bg_color;
}
......@@ -30,16 +30,16 @@
padding: $base_padding*1.5 $base_padding*2;
border-radius: $base_border_radius;
spacing: $base_padding;
transition: 0.2s all ease;
transition-duration: 100ms;
background-color: transparent;
&:ltr {padding-left: $base_padding;}
&:rtl {padding-right: $base_padding;}
&:focus, &:hover {
background-color: $hover_bg_color !important;
&:active { background-color: $active_bg_color !important;}
}
background-color: $hover_bg_color !important;
&:active { background-color: $active_bg_color !important;}
}
&:checked {background-color: $checked_bg_color !important;}
......
data/theme/gnome-shell-sass/widgets/_screen-shield.scss
View file @ aa9a1b85
......@@ -48,7 +48,9 @@
}
.unlock-dialog-notification-label {
padding: 0 0 0 12px;
padding-left: 12px;
padding-right: 0;
&:rtl { padding-right: 12px; padding-left: 0; }
}
.unlock-dialog-notification-count-text {
......
data/theme/gnome-shell-sass/widgets/_screenshot.scss
View file @ aa9a1b85
......@@ -26,8 +26,10 @@ $screenshot_ui_button_red: $error_color;
.screenshot-ui-close-button {
@extend .window-close; // copy window close button
padding: $base_padding !important; // but with more padding
&.left { margin-left: 8px;}
&.right { margin-right: 8px;}
margin-top: 12px;
box-shadow: 0 2px 4px 0 $shadow_color;
&.left { margin-left: 12px;}
&.right { margin-right: 12px;}
}
.screenshot-ui-type-button {
......@@ -81,7 +83,7 @@ $screenshot_ui_button_red: $error_color;
}
.screenshot-ui-shot-cast-container {
background-color: $hover_bg_color;
background-color: lighten($osd_bg_color,5%);
border-radius: $modal_radius;
padding: $screenshot_ui_shot_cast_spacing;
spacing: $screenshot_ui_shot_cast_spacing;
......@@ -93,7 +95,7 @@ $screenshot_ui_button_red: $error_color;
.screenshot-ui-shot-cast-button {
padding: $base_padding $base_padding*2;
background-color: transparent;
&:hover, &:focus { background-color: lighten($hover_bg_color, 5%);}
&:hover, &:focus { background-color: lighten($osd_bg_color, 10%);}
&:active { background-color: lighten($active_bg_color,5%);}
&:checked { background-color: white;color: black;}
......
data/theme/gnome-shell-sass/widgets/_window-picker.scss
View file @ aa9a1b85
......@@ -5,7 +5,7 @@ $window_picker_padding: $base_padding * 2; // 12px
$window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);
$window_close_button_color: darken(transparentize($osd_bg_color, .05), 3%);
$window_close_button_color: transparentize(lighten($osd_bg_color, 7%), .02);
$window_close_button_size: 30px;
$window_close_button_padding: 3px;
......@@ -18,7 +18,7 @@ $window_close_button_padding: 3px;
// Window titles
.window-caption {
color: $osd_fg_color;
background-color: $osd_bg_color;
background-color: lighten($osd_bg_color, 5%);
border-radius: 99px;
padding: $base_padding $base_padding * 2;
}
......@@ -28,20 +28,20 @@ $window_close_button_padding: 3px;
background-color: $window_close_button_color;
color: $osd_fg_color;
border-radius: 99px;
box-shadow: 0 2px 4px 0 $shadow_color;
padding: $window_close_button_padding;
height: $window_close_button_size;
width: $window_close_button_size;
transition-duration: 300ms;
transition-duration: 100ms;
& StIcon { icon-size: 24px; } // uses non standard icon size
&:hover {
background-color: mix($osd_fg_color, $window_close_button_color, 15%);
background-color: lighten($window_close_button_color, 7%);
}
&:active {
color: transparentize($osd_fg_color, 0.2);
background-color: darken($window_close_button_color, 5%);
background-color: lighten($window_close_button_color, 13%);
}
}
......