diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a9ba426..a53e93fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,6 @@ include: - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml" -image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0 - stages: - pre_review - prepare @@ -12,6 +10,7 @@ stages: - deploy default: + image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/35:2022-02-18.0 # Cancel jobs if newer commits are pushed to the branch interruptible: true # Auto-retry jobs in case of infra failures @@ -133,8 +132,8 @@ fedora-build: stage: build needs: - build-fedora-container - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson setup build --werror -Dextension_set=all -Dclassic_mode=true - meson compile -C build @@ -151,8 +150,8 @@ fedora-dist: stage: deploy needs: - fedora-build - before_script: - - git submodule update --init + variables: + GIT_SUBMODULE_STRATEGY: normal script: - meson dist -C build rules: diff --git a/NEWS b/NEWS index 5457d17a..1f9ca3c7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,22 @@ +43.beta +======= +* Misc. bug fixes and cleanups [Florian; !237, !238] + +Contributors: + Florian Müllner + +Translators: + Nart Tlisha [ab] + +43.alpha +======== + +Contributors: + Florian Müllner + +Translators: + Marco Ciampa [it] + 42.3 ==== * screenshot-window-sizer: Fix reported sizes on wayland [Florian; !232] diff --git a/data/classic.json.in b/data/classic.json.in index 6d2d3bd5..41976b69 100644 --- a/data/classic.json.in +++ b/data/classic.json.in @@ -6,6 +6,6 @@ "enabledExtensions": [@CLASSIC_EXTENSIONS@], "panel": { "left": ["appMenu"], "center": [], - "right": ["a11y", "keyboard", "dateMenu", "aggregateMenu"] + "right": ["a11y", "keyboard", "dateMenu", "quickSettings"] } } diff --git a/data/gnome-shell-sass/_colors.scss b/data/gnome-shell-sass/_colors.scss index 73db6fe0..c22bfea8 100644 --- a/data/gnome-shell-sass/_colors.scss +++ b/data/gnome-shell-sass/_colors.scss @@ -1,55 +1,11 @@ // 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; +@import '_palette.scss'; +$_dark_base_color: darken(desaturate(#241f31, 100%), 2%); -$base_color: if($variant == 'light', #fff, 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 checked colors +$checked_bg_color: if($variant=='light', darken($bg_color, 7%), lighten($bg_color, 7%)); +$checked_fg_color: if($variant=='light', darken($fg_color, 7%), lighten($fg_color, 7%)); + +// 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%)); diff --git a/data/gnome-shell-sass/_common.scss b/data/gnome-shell-sass/_common.scss index c6e64766..f2fe78a3 100644 --- a/data/gnome-shell-sass/_common.scss +++ b/data/gnome-shell-sass/_common.scss @@ -35,17 +35,10 @@ $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%)); +// Chroma key to flag when a background-color is always occluded, not visible. +// This allows any box-shadow behind it to be rendered more efficiently by +// omitting the middle rectangle. +$invisible_occluded_bg_color: rgba(3,2,1,0); // fonts $base_font_size: 11; @@ -86,7 +79,7 @@ stage { padding: $base_padding; spacing: $base_padding; border: 2px solid transparent; - transition-duration: 100ms; + transition-duration: 200ms; text-align: center; } @@ -114,11 +107,28 @@ stage { &:checked { @include button(checked);} } +// normal icon-only button +%icon_button { + border-radius: 99px; + border-style: solid; + border-width: 1px; + font-weight: bold; + padding: $base_padding*2; + + @include button(normal); + &:focus { @include button(focus);} + &:hover { @include button(hover);} + &:insensitive { @include button(insensitive);} + &:active { @include button(active);} + &:checked { @include button(checked);} + + & > StIcon { icon-size: $base_icon_size; } +} + // buttons in dialogs/notifications // 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 +173,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 */ diff --git a/data/gnome-shell-sass/_drawing.scss b/data/gnome-shell-sass/_drawing.scss index 10c1c3f3..bdb2fb26 100644 --- a/data/gnome-shell-sass/_drawing.scss +++ b/data/gnome-shell-sass/_drawing.scss @@ -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 { @@ -201,7 +200,7 @@ $button_bg_color: mix($tc, $c, 5%); background-color: $selected_bg_color; color: $selected_fg_color; &:focus { - box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.4); + box-shadow: inset 0 0 0 2px lighten($selected_bg_color, 10%); } &:hover, &:focus { background-color: lighten($selected_bg_color, 5%); @@ -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); } } diff --git a/data/gnome-shell-sass/_high-contrast-colors.scss b/data/gnome-shell-sass/_high-contrast-colors.scss index 54f6853c..35e2d851 100644 --- a/data/gnome-shell-sass/_high-contrast-colors.scss +++ b/data/gnome-shell-sass/_high-contrast-colors.scss @@ -1,32 +1,43 @@ // 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: rgba(0,0,0, 0.1); -$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color +$shadow_color: transparent; + +// cards +$card_bg_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 12%)); + +// 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 checked colors +$checked_bg_color: if($variant=='light', darken($bg_color, 12%), lighten($bg_color, 18%)); +$checked_fg_color: if($variant=='light', darken($fg_color, 12%), lighten($fg_color, 18%)); + +// 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%)); diff --git a/data/gnome-shell-sass/_palette.scss b/data/gnome-shell-sass/_palette.scss new file mode 100644 index 00000000..78847d95 --- /dev/null +++ b/data/gnome-shell-sass/_palette.scss @@ -0,0 +1,46 @@ +//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 diff --git a/data/gnome-shell-sass/_widgets.scss b/data/gnome-shell-sass/_widgets.scss index 4ed082f1..a09e0b54 100644 --- a/data/gnome-shell-sass/_widgets.scss +++ b/data/gnome-shell-sass/_widgets.scss @@ -24,7 +24,6 @@ @import 'widgets/hotplug'; // Dialogs @import 'widgets/dialogs'; -@import 'widgets/network-dialog'; // OSDs @import 'widgets/osd'; @import 'widgets/switcher-popup'; @@ -33,6 +32,7 @@ // Panel @import 'widgets/panel'; @import 'widgets/corner-ripple'; +@import 'widgets/quick-settings'; // Overview @import 'widgets/overview'; @import 'widgets/window-picker'; diff --git a/data/gnome-shell-sass/widgets/_app-grid.scss b/data/gnome-shell-sass/widgets/_app-grid.scss index c936e4b6..49d3086a 100644 --- a/data/gnome-shell-sass/widgets/_app-grid.scss +++ b/data/gnome-shell-sass/widgets/_app-grid.scss @@ -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; @@ -123,32 +124,16 @@ $app_icon_size: 96px; icon-size: $app_icon_size * 0.5; } -.page-navigation-hint { - width: 300px; - - &.dnd { - background: rgba(255, 255, 255, 0.1); - } - - &.next:ltr, - &.previous:rtl { - background-gradient-start: rgba(255, 255, 255, 0.05); - background-gradient-end: transparent; - background-gradient-direction: horizontal; - border-radius: $modal_radius*1.5 0px 0px $modal_radius*1.5; - } - - &.previous:ltr, - &.next:rtl { - background-gradient-start: transparent; - background-gradient-end: rgba(255, 255, 255, 0.05); - background-gradient-direction: horizontal; - border-radius: 0px $modal_radius*1.5 $modal_radius*1.5 0px; - } -} - .page-navigation-arrow { - margin: 6px; - width: 24px; - height: 24px; + & > StIcon { + margin: 6px; + padding: 18px; + width: 24px; + height: 24px; + border-radius: 99px; + } + + &:insensitive > StIcon { @include button(undecorated, $osd_fg_color, transparentize($osd_bg_color, 0.5));} + &:hover > StIcon { @include button(hover, $osd_fg_color, transparentize($osd_bg_color, 0.5));} + &:active > StIcon { @include button(active, $osd_fg_color, transparentize($osd_bg_color, 0.5));} } diff --git a/data/gnome-shell-sass/widgets/_buttons.scss b/data/gnome-shell-sass/widgets/_buttons.scss index 6a72c079..df995245 100644 --- a/data/gnome-shell-sass/widgets/_buttons.scss +++ b/data/gnome-shell-sass/widgets/_buttons.scss @@ -4,3 +4,7 @@ @extend %button; // that's it min-height: 22px; } + +.icon-button { + @extend %icon_button; // that's it +} diff --git a/data/gnome-shell-sass/widgets/_calendar.scss b/data/gnome-shell-sass/widgets/_calendar.scss index 465dc053..336372cd 100644 --- a/data/gnome-shell-sass/widgets/_calendar.scss +++ b/data/gnome-shell-sass/widgets/_calendar.scss @@ -69,6 +69,7 @@ height: $calendar_day_size !important; width: $calendar_day_size !important; border-radius: 99px; + transition-duration: 100ms; @extend %numeric; @extend %smaller; diff --git a/data/gnome-shell-sass/widgets/_corner-ripple.scss b/data/gnome-shell-sass/widgets/_corner-ripple.scss index 9137b67c..9aff4317 100644 --- a/data/gnome-shell-sass/widgets/_corner-ripple.scss +++ b/data/gnome-shell-sass/widgets/_corner-ripple.scss @@ -3,8 +3,8 @@ $ripple_size: 50px; .ripple-box { - background-color: lighten(transparentize($selected_bg_color, 0.7), 40%); - box-shadow: 0 0 2px 2px lighten($selected_bg_color, 20%); + background-color: rgba(255,255,255,0.2); + box-shadow: 0 0 2px 2px rgba(255,255,255,0.2); // plus + 2px for the border (box-shadow) width: $ripple_size + 2px; height: $ripple_size + 2px; diff --git a/data/gnome-shell-sass/widgets/_dialogs.scss b/data/gnome-shell-sass/widgets/_dialogs.scss index 6ac4e8fd..defa20b3 100644 --- a/data/gnome-shell-sass/widgets/_dialogs.scss +++ b/data/gnome-shell-sass/widgets/_dialogs.scss @@ -165,3 +165,8 @@ height: 300px; width: 300px; } + +/* Access portal dialog */ +.access-dialog { + text-align: center; +} \ No newline at end of file diff --git a/data/gnome-shell-sass/widgets/_ibus-popup.scss b/data/gnome-shell-sass/widgets/_ibus-popup.scss index 28f89f33..8cbaa952 100644 --- a/data/gnome-shell-sass/widgets/_ibus-popup.scss +++ b/data/gnome-shell-sass/widgets/_ibus-popup.scss @@ -29,8 +29,11 @@ .horizontal & { padding-left: $base_padding*2; } } -.candidate-page-button { padding: $base_padding;} +.candidate-page-button { + padding: $base_padding; + + & StIcon { icon-size: $base_icon_size; } +} .candidate-page-button-previous { border-radius: $base_border_radius 0px 0px $base_border_radius; border-right-width: 0;box-shadow: none;} .candidate-page-button-next { border-radius: 0px $base_border_radius $base_border_radius 0px;box-shadow: none;} -.candidate-page-button-icon { icon-size: $base_icon_size; } diff --git a/data/gnome-shell-sass/widgets/_keyboard.scss b/data/gnome-shell-sass/widgets/_keyboard.scss index 91d9a3d5..1dc6b953 100644 --- a/data/gnome-shell-sass/widgets/_keyboard.scss +++ b/data/gnome-shell-sass/widgets/_keyboard.scss @@ -61,6 +61,12 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken( &:active { @include keyboard_key(active, $default_key_bg_color, $osd_fg_color);} &:checked { @include keyboard_key(checked, $default_key_bg_color, $osd_fg_color);} border-radius: $key_border_radius; + + // keys that may be latched: ctrl/alt/shift + &:latched { + border-color: lighten($selected_bg_color, 5%); + background-color: $selected_bg_color; + } } // enter key is suggested-action @@ -130,9 +136,9 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken( // suggestions .word-suggestions { - @include fontsize($base_font_size + 3); + @include fontsize($base_font_size + 1); spacing: 12px; - min-height: 20pt; + min-height: 17pt; padding: $base_padding*2; color: $osd_fg_color; @@ -141,7 +147,7 @@ $default_key_bg_color: if($variant=='light', darken($key_bg_color, 11%), darken( margin: 0 3px; min-width: 32px; border-radius: $base_border_radius - 2px; - padding: $base_padding $base_padding*3; + padding: 0px $base_padding*3; @include keyboard_key(undecorated, $key_bg_color, $osd_fg_color); diff --git a/data/gnome-shell-sass/widgets/_login-dialog.scss b/data/gnome-shell-sass/widgets/_login-dialog.scss index 2572f970..23456be5 100644 --- a/data/gnome-shell-sass/widgets/_login-dialog.scss +++ b/data/gnome-shell-sass/widgets/_login-dialog.scss @@ -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; } } diff --git a/data/gnome-shell-sass/widgets/_looking-glass.scss b/data/gnome-shell-sass/widgets/_looking-glass.scss index 8639889e..00630c33 100644 --- a/data/gnome-shell-sass/widgets/_looking-glass.scss +++ b/data/gnome-shell-sass/widgets/_looking-glass.scss @@ -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; @@ -79,6 +79,8 @@ color: $insensitive_fg_color; &:hover { color: lighten($insensitive_fg_color, 20%); } &:active { color: darken($insensitive_fg_color, 20%); } + + & StIcon { icon-size: 12px; } } } diff --git a/data/gnome-shell-sass/widgets/_message-list.scss b/data/gnome-shell-sass/widgets/_message-list.scss index 7f93e817..5196661c 100644 --- a/data/gnome-shell-sass/widgets/_message-list.scss +++ b/data/gnome-shell-sass/widgets/_message-list.scss @@ -123,6 +123,8 @@ margin: 1px; &:hover {background-color: transparentize($fg_color, 0.8);} &:active {background-color: transparentize($fg_color, 0.9);} + + & StIcon { icon-size: $base_icon_size; } } // body @@ -157,6 +159,8 @@ // fix margin for last button &:last-child:ltr { margin-right: $base_margin*3; } &:last-child:rtl { margin-left: $base_margin*3; } + + & StIcon { icon-size: $base_icon_size; } } // album-art diff --git a/data/gnome-shell-sass/widgets/_network-dialog.scss b/data/gnome-shell-sass/widgets/_network-dialog.scss deleted file mode 100644 index 11e4e676..00000000 --- a/data/gnome-shell-sass/widgets/_network-dialog.scss +++ /dev/null @@ -1,48 +0,0 @@ -/* Select Network dialogs */ -.nm-dialog { - max-height: 34em; - min-height: 31em; - min-width: 32em; -} - -.nm-dialog-content { - spacing: 20px; - padding: 24px; -} - -.nm-dialog-header { @extend %heading; } -.nm-dialog-subheader { color: $insensitive_fg_color;} -.nm-dialog-header-icon { icon-size: $large_icon_size;} -.nm-dialog-header-hbox { spacing: 10px; } - -.nm-dialog-scroll-view { - padding:$base_padding; - border-radius: $base_border_radius; - background-color: $base_color; -} - -.nm-dialog-item { - padding: $base_padding * 2; - - &:selected { - background-color: $selected_bg_color; - border-radius: $base_border_radius - 3px; - color: $selected_fg_color; - } - &:hover { background-color:$hover_bg_color;} -} - -.nm-dialog-icon { icon-size: $base_icon_size; } -.nm-dialog-icons { spacing: $base_padding * 2; } - -// no networks -.no-networks-box { spacing: $base_padding; } -.no-networks-label { color: $insensitive_fg_color; } - -// airplane mode -.nm-dialog-airplane-box { - text-align: center; - spacing: 12px; -} -.nm-dialog-airplane-headline { @extend %title_3;} -.nm-dialog-airplane-text { color: $insensitive_fg_color;} diff --git a/data/gnome-shell-sass/widgets/_notifications.scss b/data/gnome-shell-sass/widgets/_notifications.scss index 7866767e..86480a87 100644 --- a/data/gnome-shell-sass/widgets/_notifications.scss +++ b/data/gnome-shell-sass/widgets/_notifications.scss @@ -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; diff --git a/data/gnome-shell-sass/widgets/_panel.scss b/data/gnome-shell-sass/widgets/_panel.scss index 3fc57eb0..fd3e7d2d 100644 --- a/data/gnome-shell-sass/widgets/_panel.scss +++ b/data/gnome-shell-sass/widgets/_panel.scss @@ -40,7 +40,14 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px $screenshot_ui_button_red; + } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px $warning_color; + StBoxLayout { margin: 0 $base_padding; } + } + &.screen-recording-indicator, + &.screen-sharing-indicator { StBoxLayout { spacing: $base_padding; } @@ -66,6 +73,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.15); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.15); + } } &:hover { @@ -80,6 +90,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.1); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.1); + } } &:active:hover, &:overview:hover, &:focus:hover, &:checked:hover { @@ -94,6 +107,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.2); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.2); + } } // status area icons @@ -137,6 +153,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.15); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.15); + } } &:hover { @@ -151,6 +170,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.1); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.1); + } } &:active:hover, &:overview:hover, &:focus:hover, &:checked:hover { @@ -165,6 +187,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration &.screen-recording-indicator { box-shadow: inset 0 0 0 100px transparentize($screenshot_ui_button_red, 0.2); } + &.screen-sharing-indicator { + box-shadow: inset 0 0 0 100px transparentize($warning_color, 0.2); + } } } } diff --git a/data/gnome-shell-sass/widgets/_popovers.scss b/data/gnome-shell-sass/widgets/_popovers.scss index 08ad3246..138a4fc0 100644 --- a/data/gnome-shell-sass/widgets/_popovers.scss +++ b/data/gnome-shell-sass/widgets/_popovers.scss @@ -19,27 +19,27 @@ // popover content .popup-menu-content { padding: $base_padding; - border-radius: $modal_radius - 2px; + border-radius: $modal_radius*1.25; 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; } // menu items .popup-menu-item { padding: $base_padding*1.5 $base_padding*2; - border-radius: $base_border_radius; + border-radius: $base_border_radius*1.5; 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;} @@ -100,12 +100,12 @@ border-radius: 0 0 $base_border_radius $base_border_radius; } - &:focus,&:hover { background-color: lighten($hover_bg_color, 10%) !important;} + &:focus,&:hover { background-color: $hover_bg_color !important;} &:checked { - background-color: lighten($checked_bg_color, 10%) !important; + background-color: $checked_bg_color !important; &:focus,&:hover { background-color: lighten($checked_bg_color, 8%) !important;} } - &:active { background-color: lighten($active_bg_color, 10%) !important;} + &:active { background-color: $active_bg_color !important;} } .popup-menu-section { @@ -164,28 +164,6 @@ -arrow-rise: 0px; // hide the beak on the menu } -// system status menu -.aggregate-menu { - min-width: 22em; - - // this is unneeded at the top-level in this menu, hide it - .popup-menu-ornament { width: 0 !important; } - - // lock screen, shutdown, etc. buttons - .popup-menu-icon { - -st-icon-style: symbolic; - &:ltr {margin-right: $base_margin*2;} - &:rtl {margin-left: $base_margin*2;} - } - - // account for ornaments in submenus with padding - .popup-sub-menu .popup-menu-item > :first-child { - // this value is hardcoded for visual effect - &:ltr { margin-left: 1em;} - &:rtl { margin-right: 1em;} - } -} - // right-click (and panel) app menu .app-menu { max-width: 27.25em; diff --git a/data/gnome-shell-sass/widgets/_quick-settings.scss b/data/gnome-shell-sass/widgets/_quick-settings.scss new file mode 100644 index 00000000..225ab486 --- /dev/null +++ b/data/gnome-shell-sass/widgets/_quick-settings.scss @@ -0,0 +1,109 @@ +.quick-settings { + padding: 4 * $base_padding; +} + +.quick-settings-grid { + spacing-rows: 3 * $base_padding; + spacing-columns: 2 * $base_padding; +} + +.quick-toggle { + border-radius: 99px; + min-width: 11.5em; + max-width: 11.5em; + min-height: 44px; + + &:checked { @include button(default); } + + & > StBoxLayout { spacing: $base_padding; } + + /* Move padding into the box; this is to allow menu arrows + to extend to the border */ + &.button { padding: 0; } + & > StBoxLayout { padding: 0 2 * $base_padding; } + + .quick-toggle-label { font-weight: bold; } + .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size; } +} + +.quick-menu-toggle { + &:ltr > StBoxLayout { padding-right: 0; } + &:rtl > StBoxLayout { padding-left: 0; } + + & .quick-toggle-arrow { + background-color: transparentize($fg_color, 0.9); + padding: 8px; + + &:ltr { border-radius: 0 99px 99px 0; } + &:rtl { border-radius: 99px 0 0 99px; } + } +} + +.quick-slider { + padding: 0 $base_padding; + + & > StBoxLayout { spacing: $base_padding; } + + .slider-bin { + &:focus {@include button(focus);} + min-height: 16px; // slider size + padding: $base_padding; + border-radius: 99px; + } + .quick-toggle-icon { icon-size: $base_icon_size; } + .icon-button { background-color: transparent; } +} + +.quick-toggle-menu { + background-color: $card_bg_color; + border-radius: $base_border_radius*2.75; + padding: $base_padding*2.75; + margin: 0 $base_padding*2.75; + + & .header { + spacing-rows: 0.5 * $base_padding; + spacing-columns: $base_padding*2; + padding-bottom: 2 * $base_padding; + + & .icon { + icon-size: $base_icon_size*1.5; // a non-standard symbolic size but ok + border-radius: 999px; + padding: 1.5 * $base_padding; + background-color: lighten($bg_color, 10%); + + &.active { background-color: $selected_bg_color; } + } + + & .title { + @extend %title_3; + } + + & .subtitle { + @extend %caption_heading; + } + } +} + +.quick-toggle-menu-container { + padding: 2 * $base_padding $base_padding 0; + } + +.quick-settings-system-item { + & > StBoxLayout { spacing: 2 * $base_padding; } + + .icon-button > StIcon { -st-icon-style: symbolic; } + + & .power-item { + min-height: 0; + min-width: 0; + + &:insensitive { + @include button(normal); + background-color: transparent; + } + } +} + +.nm-network-item { + .wireless-secure-icon { icon-size: 0.5 * $base_icon_size; } +} diff --git a/data/gnome-shell-sass/widgets/_screen-shield.scss b/data/gnome-shell-sass/widgets/_screen-shield.scss index 6550e5bc..a459ba16 100644 --- a/data/gnome-shell-sass/widgets/_screen-shield.scss +++ b/data/gnome-shell-sass/widgets/_screen-shield.scss @@ -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 { diff --git a/data/gnome-shell-sass/widgets/_screenshot.scss b/data/gnome-shell-sass/widgets/_screenshot.scss index c0a983df..f7fa3da2 100644 --- a/data/gnome-shell-sass/widgets/_screenshot.scss +++ b/data/gnome-shell-sass/widgets/_screenshot.scss @@ -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;} diff --git a/data/gnome-shell-sass/widgets/_window-picker.scss b/data/gnome-shell-sass/widgets/_window-picker.scss index 84aaa43a..9067a6d4 100644 --- a/data/gnome-shell-sass/widgets/_window-picker.scss +++ b/data/gnome-shell-sass/widgets/_window-picker.scss @@ -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,25 +28,26 @@ $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%); } } .workspace-background { // keep in sync with BACKGROUND_CORNER_RADIUS_PIXELS in workspace.js border-radius: 30px; + background-color: $invisible_occluded_bg_color; box-shadow: 0 4px 16px 4px transparentize(darken($osd_bg_color, 30%), 0.7); } diff --git a/data/meson.build b/data/meson.build index 78d27824..9f4ed91b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -69,12 +69,12 @@ theme_sources = files( 'gnome-shell-sass/widgets/_looking-glass.scss', 'gnome-shell-sass/widgets/_message-list.scss', 'gnome-shell-sass/widgets/_misc.scss', - 'gnome-shell-sass/widgets/_network-dialog.scss', 'gnome-shell-sass/widgets/_notifications.scss', 'gnome-shell-sass/widgets/_osd.scss', 'gnome-shell-sass/widgets/_overview.scss', 'gnome-shell-sass/widgets/_panel.scss', 'gnome-shell-sass/widgets/_popovers.scss', + 'gnome-shell-sass/widgets/_quick-settings.scss', 'gnome-shell-sass/widgets/_screen-shield.scss', 'gnome-shell-sass/widgets/_scrollbars.scss', 'gnome-shell-sass/widgets/_search-entry.scss', diff --git a/extensions/native-window-placement/extension.js b/extensions/native-window-placement/extension.js index 7a4b4cf0..78d4c7ba 100644 --- a/extensions/native-window-placement/extension.js +++ b/extensions/native-window-placement/extension.js @@ -285,8 +285,8 @@ function enable() { } /** - * @param {Object} object - object that was modified - * @param {Object} injection - the map of previous injections + * @param {object} object - object that was modified + * @param {object} injection - the map of previous injections * @param {string} name - the @injection key that should be removed */ function removeInjection(object, injection, name) { diff --git a/meson.build b/meson.build index 25af71e0..3c93e8bb 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '42.3', + version: '43.beta', meson_version: '>= 0.53.0', license: 'GPL2+' ) diff --git a/po/ab.po b/po/ab.po index 2c443e5d..e065d4e3 100644 --- a/po/ab.po +++ b/po/ab.po @@ -6,9 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell-extensions main\n" -"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/" -"issues\n" -"POT-Creation-Date: 2022-02-12 02:08+0000\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues\n" +"POT-Creation-Date: 2022-07-10 12:54+0000\n" "PO-Revision-Date: 2022-02-12 02:08+0000\n" "Last-Translator: Нанба Наала , 2022\n" "Language-Team: Abkhazian \n" @@ -34,11 +33,11 @@ msgstr "Аклассикатә GNOME Wayland аҟны" msgid "GNOME Classic on Xorg" msgstr "Аклассикатә GNOME Xorg аҟны" -#: extensions/apps-menu/extension.js:112 +#: extensions/apps-menu/extension.js:118 msgid "Favorites" msgstr "Иалкаау" -#: extensions/apps-menu/extension.js:370 +#: extensions/apps-menu/extension.js:379 msgid "Applications" msgstr "Аԥшьқәа" @@ -50,29 +49,30 @@ msgstr "Аԥшьи аусуратә ҵакырақәа рыхьӡынҵеи" msgid "" "A list of strings, each containing an application id (desktop file name), " "followed by a colon and the workspace number" -msgstr "Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )" -"змоу, зашьҭахь ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу " +msgstr "" +"Ацәаҳәақәа рыхьӡынҵа аиԥшрагәаҭага аԥшьы (desktop-фаил ахьӡ )змоу, зашьҭахь " +"ҩ-кәаԥки аусуратә ҭыԥ аномери гылоу " -#: extensions/auto-move-windows/prefs.js:19 +#: extensions/auto-move-windows/prefs.js:152 msgid "Workspace Rules" msgstr "Аусуратә ҵакыра аԥҟаррақәа" -#: extensions/auto-move-windows/prefs.js:245 +#: extensions/auto-move-windows/prefs.js:306 msgid "Add Rule" msgstr "Аԥҟара ацҵара" #. TRANSLATORS: %s is the filesystem name -#: extensions/drive-menu/extension.js:123 +#: extensions/drive-menu/extension.js:126 #: extensions/places-menu/placeDisplay.js:210 #, javascript-format msgid "Ejecting drive “%s” failed:" msgstr "Адиск «%s» аҭыгара залымшахеит:" -#: extensions/drive-menu/extension.js:139 +#: extensions/drive-menu/extension.js:145 msgid "Removable devices" msgstr "Иаҿыҵуа аиҿартәырақәа" -#: extensions/drive-menu/extension.js:161 +#: extensions/drive-menu/extension.js:167 msgid "Open Files" msgstr "Афаил аартра" @@ -85,9 +85,11 @@ msgid "" "Try to use more screen for placing window thumbnails by adapting to screen " "aspect ratio, and consolidating them further to reduce the bounding box. " "This setting applies only with the natural placement strategy." -msgstr "Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразы" -"аекран аганқәа реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа архәыҷразы" -"ари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра алгоритм ахархәараан" +msgstr "" +"Шәхы иашәырхәа изыцҵоу аекран аҵакыра аминиатиура атыԥаркразыаекран аганқәа " +"реизышәара ԥсахуа аҭыԥыркра шәыржәпала, анаҩс адаԥа ҳәаақәызҵо ашәагаа " +"архәыҷразыари ахышәара ахархәара аиуоит аминиатиура «natural» аҭыԥыркра " +"алгоритм ахархәараан" #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11 msgid "Place window captions on top" @@ -98,12 +100,13 @@ msgid "" "If true, place window captions on top the respective thumbnail, overriding " "shell default of placing it at the bottom. Changing this setting requires " "restarting the shell to have any effect." -msgstr "Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит" -"(ишыҟоу еиԥш ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан," -"уи аус аура иалагарцазы, иаҭахуп Shell аиҭарура." +msgstr "" +"Иалхзар, ахқәа аминиатиура хыхьтәи ахәҭаҟны аҭыԥ ааныркылалоит(ишыҟоу еиԥш " +"ахқәа ҵаҟатәи аҭыԥ ааныркылоит).Ари ахышәара аԥсахраан,уи аус аура " +"иалагарцазы, иаҭахуп Shell аиҭарура." -#: extensions/places-menu/extension.js:88 -#: extensions/places-menu/extension.js:91 +#: extensions/places-menu/extension.js:94 +#: extensions/places-menu/extension.js:97 msgid "Places" msgstr "Аҭыԥқәа" @@ -166,27 +169,27 @@ msgstr "Аиҭашьақәыргылара" msgid "Maximize" msgstr "Аиҵыхра" -#: extensions/window-list/extension.js:434 +#: extensions/window-list/extension.js:483 msgid "Minimize all" msgstr "Зегьы реиҟәырҳәра" -#: extensions/window-list/extension.js:440 +#: extensions/window-list/extension.js:489 msgid "Unminimize all" msgstr "Зегьы рырхынҳәра" -#: extensions/window-list/extension.js:446 +#: extensions/window-list/extension.js:495 msgid "Maximize all" msgstr "Зегьы реиҵыхра" -#: extensions/window-list/extension.js:454 +#: extensions/window-list/extension.js:503 msgid "Unmaximize all" msgstr "Зегьы реиҭашьақәыргылара" -#: extensions/window-list/extension.js:462 +#: extensions/window-list/extension.js:511 msgid "Close all" msgstr "Зегьы рыркра" -#: extensions/window-list/extension.js:741 +#: extensions/window-list/extension.js:795 msgid "Window List" msgstr "Аԥенџьырқәа рыхьӡынҵа" @@ -198,18 +201,21 @@ msgstr "Аԥенџьырқәа аидыргәыԥлара анаҭаху" msgid "" "Decides when to group windows from the same application on the window list. " "Possible values are “never”, “auto” and “always”." -msgstr "Иҳәаақәнаҵоит, ианаҭаху ԥшьык иаҵанакуа аԥенџьырқәа реидыргәыԥлара, аԥенџьырқәа рыхьӡынҵаҟны" -" Иҟалар зылшо аҵакқәа : «never» — ахаан; «auto» — автоматла; «always» — есқьынгьы" +msgstr "" +"Иҳәаақәнаҵоит, ианаҭаху ԥшьык иаҵанакуа аԥенџьырқәа реидыргәыԥлара, " +"аԥенџьырқәа рыхьӡынҵаҟны Иҟалар зылшо аҵакқәа : «never» — ахаан; «auto» — " +"автоматла; «always» — есқьынгьы" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20 -#: extensions/window-list/prefs.js:76 +#: extensions/window-list/prefs.js:79 msgid "Show windows from all workspaces" msgstr "Аҵакырақәа зегьы рҟынтә аԥенџьырқәа раарԥшра" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:21 msgid "Whether to show windows from all workspaces or only the current one." -msgstr -"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи аҟынтә акәу ишаарԥшлатәу" +msgstr "" +"Аԥенџьырқәа рыхьӡынҵа аусуратә ҵакырақәа зегь рҟынтә акәу,мамзар уажәтәи " +"аҟынтә акәу ишаарԥшлатәу" #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:27 msgid "Show the window list on all monitors" @@ -219,43 +225,44 @@ msgstr "Аԥенџьырқәа рыхьӡынҵа амониторқәа зег msgid "" "Whether to show the window list on all connected monitors or only on the " "primary one." -msgstr -"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , мамзар ихадоу аҟны акәу." +msgstr "" +"Аԥенџьырқәа рыхьӡынҵа иаҿаку амониторқәа зегьы рыҟноума иахьаарԥшлатәу , " +"мамзар ихадоу аҟны акәу." -#: extensions/window-list/prefs.js:32 +#: extensions/window-list/prefs.js:35 msgid "Window Grouping" msgstr "Аԥенџьырқәа реидыргәыԥлара" -#: extensions/window-list/prefs.js:37 +#: extensions/window-list/prefs.js:40 msgid "Never group windows" msgstr "Ахаангьы аԥенџьырқәа реидмыргәыԥлара" -#: extensions/window-list/prefs.js:38 +#: extensions/window-list/prefs.js:41 msgid "Group windows when space is limited" msgstr "Аҭыԥ маҷхазар, аԥенџьырқәа еидшәыргәыԥла" -#: extensions/window-list/prefs.js:39 +#: extensions/window-list/prefs.js:42 msgid "Always group windows" msgstr "Еснагь аԥенџьырқәа реидыргәыԥлара" -#: extensions/window-list/prefs.js:63 +#: extensions/window-list/prefs.js:66 msgid "Show on all monitors" msgstr "Амониторқәа зегьы рҟны рырбара" -#: extensions/window-list/workspaceIndicator.js:249 -#: extensions/workspace-indicator/extension.js:254 +#: extensions/window-list/workspaceIndicator.js:261 +#: extensions/workspace-indicator/extension.js:266 msgid "Workspace Indicator" msgstr "Аусуратә ҵакыра аиндикатор" -#: extensions/workspace-indicator/prefs.js:18 -msgid "Workspace Names" -msgstr "Аусуратә ҵакырақәа рыхьӡқәа" - -#: extensions/workspace-indicator/prefs.js:39 +#: extensions/workspace-indicator/prefs.js:62 #, javascript-format msgid "Workspace %d" msgstr "Аусуратә ҵакыра %d" -#: extensions/workspace-indicator/prefs.js:184 +#: extensions/workspace-indicator/prefs.js:129 +msgid "Workspace Names" +msgstr "Аусуратә ҵакырақәа рыхьӡқәа" + +#: extensions/workspace-indicator/prefs.js:255 msgid "Add Workspace" msgstr "Аусуратә ҵакыра ацҵара" diff --git a/po/it.po b/po/it.po index c3698a7b..ef0c5eab 100644 --- a/po/it.po +++ b/po/it.po @@ -80,7 +80,7 @@ msgstr "Dispositivi rimovibili" #: extensions/drive-menu/extension.js:171 msgid "Open Files" -msgstr "Apri file" +msgstr "Apri File" #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5 msgid "Use more screen for windows"