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.

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 #82

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 0 additions & 46 deletions gnome-shell/upstream/colorable-assets/checkbox-focused.svg

This file was deleted.

42 changes: 0 additions & 42 deletions gnome-shell/upstream/colorable-assets/checkbox-off-focused.svg

This file was deleted.

42 changes: 0 additions & 42 deletions gnome-shell/upstream/colorable-assets/checkbox-off.svg

This file was deleted.

46 changes: 0 additions & 46 deletions gnome-shell/upstream/colorable-assets/checkbox.svg

This file was deleted.

1 change: 0 additions & 1 deletion gnome-shell/upstream/colorable-assets/toggle-off.svg

This file was deleted.

1 change: 0 additions & 1 deletion gnome-shell/upstream/colorable-assets/toggle-on.svg

This file was deleted.

3 changes: 2 additions & 1 deletion gnome-shell/upstream/data/gnome-shell-icons.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<file preprocess="xml-stripblanks">scalable/actions/shell-focus-top-bar-symbolic-rtl.svg</file>
<file preprocess="xml-stripblanks">scalable/actions/shell-focus-windows-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/background-app-ghost-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/check-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-high-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-medium-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-brightness-off-symbolic.svg</file>
Expand All @@ -45,6 +46,7 @@
<file preprocess="xml-stripblanks">scalable/status/keyboard-hide-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-layout-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-shift-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/keyboard-zwnj-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/message-indicator-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/no-notifications-symbolic.svg</file>
<file preprocess="xml-stripblanks">scalable/status/screen-privacy-disabled-symbolic.svg</file>
Expand All @@ -53,4 +55,3 @@
<file preprocess="xml-stripblanks">scalable/status/switch-off-symbolic.svg</file>
</gresource>
</gresources>

37 changes: 37 additions & 0 deletions gnome-shell/upstream/data/icons/scalable/status/check-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion gnome-shell/upstream/gnome-shell-sass/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ $bg_color: if($variant=='light', #FAFAFA, $bg_color_dark);
$fg_color_dark: $porcelain;
$fg_color: if($variant=='light', $inkstone, $fg_color_dark);

$is_warty_nostalgia: false !default;
@if $is_warty_nostalgia {
$bg_color: $warty_nostalgia_bg;
}

// OSD elements
$osd_fg_color: $light_1;
$osd_bg_color: lighten($_base_color_dark, 5%);
Expand Down Expand Up @@ -57,7 +62,7 @@ $osd_outer_borders_color: transparentize($osd_fg_color, 0.98);

// system colors
$system_bg_color: lighten($system_base_color, 5%);
$system_bg_color: lighten($jet, 4%); // Lighten than dash but darken than bg-color
$system_bg_color: $_base_color_dark; // Yaru - use our definition our definition
$system_borders_color: transparentize($system_fg_color, .9);
$system_insensitive_fg_color: mix($system_fg_color, $system_bg_color, 50%);
$system_overlay_bg_color: mix($system_base_color, $system_fg_color, 90%); // for non-transparent items, e.g. dash
Expand Down
78 changes: 36 additions & 42 deletions gnome-shell/upstream/gnome-shell-sass/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ $forced_circular_radius: 999px;
$modal_radius: $base_border_radius * 2;
$modal_radius: $base_border_radius; // Yaru change: reduce modal border-radius

// radii of dialogs
$alert_radius: 18px;
$alert_radius: 8px; // Yaru change: reduce modal border-radius

// 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.
Expand All @@ -63,6 +67,9 @@ $large_scalable_icon_size: $scalable_icon_size * 2;
// animation definition
$ease_out_quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);

// Yaru menu radius
$yaru_menu_border_radius: $modal_radius * 2.25;

// Stage
stage {
@include fontsize($base_font_size);
Expand Down Expand Up @@ -186,8 +193,12 @@ stage {
min-height: 22px; // Yaru change: fix for height shift
border-radius: $base_border_radius;
padding: $base_padding * 1.5 $base_padding * 1.5;
selection-background-color: st-transparentize(-st-accent-color, 0.7);
selected-color: $fg_color;
// Yaru: Use legacy accent color. TODO: drop.
selection-background-color: $selected_bg_color;
selected-color: $selected_fg_color;

border-width: 1px; // Yaru change: we want bordered entries
}

Expand All @@ -203,50 +214,33 @@ stage {
}
}

// buttons in dialogs/notifications
// lighter in color and have a greater radius
// buttons in notifications
// use a rounded style and have a lighter background
%notification_button {
// font-weight: bold; // Yaru change: use normal font weight
padding: $base_padding $base_padding * 2;
border-radius: $base_border_radius;

@include button(normal, $style: notification);
&:focus { @include button(focus, $style: notification);}
&:hover { @include button(hover, $style: notification);}
&:active { @include button(active, $style: notification);}
&:checked { @include button(checked, $style: notification);}
&:insensitive { @include button(insensitive, $style: notification);}
}

// buttons in dialogs
%bubble_button {
%dialog_button {
// font-weight: bold; // Yaru change: use normal font weight
padding: $base_padding * 2;
// font-weight: bold !important; // Yaru change: use normal font weight

&:ltr {margin-right: 1px;}
&:rtl {margin-left: 1px;}

// needs a 1px adjustment to fit exactly into the outer radius
$bubble_button_radius: $modal_radius - 1px;

@include button(normal, $style: bubble);
&:focus { @include button(focus, $style: bubble);}
&:hover { @include button(hover, $style: bubble);}
&:active { @include button(active, $style: bubble);}
&:checked { @include button(checked, $style: bubble);}
&:insensitive { @include button(insensitive, $style: bubble);}

&:first-child:ltr {
border-radius: 0 0 0 $bubble_button_radius;
}

&:last-child:ltr {
border-radius: 0 0 $bubble_button_radius;
margin-right: 0 !important;
}

&:first-child:rtl {
border-radius: 0 0 $bubble_button_radius;
}

&:last-child:rtl {
border-radius: 0 0 0 $bubble_button_radius;
margin-left: 0 !important;
}
border-radius: $base_border_radius * 1.5;

&:first-child:last-child {
border-radius: 0 0 $bubble_button_radius $bubble_button_radius;
margin-left: 0 !important;
margin-right: 0 !important;
}
@include button(normal, $style: dialog);
&:focus { @include button(focus, $style: dialog);}
&:hover { @include button(hover, $style: dialog);}
&:active { @include button(active, $style: dialog);}
&:checked { @include button(checked, $style: dialog);}
&:insensitive { @include button(insensitive, $style: dialog);}
}

// tooltip
Expand Down Expand Up @@ -308,10 +302,10 @@ stage {

%smaller {
font-weight: 400;
@include fontsize(8pt);
@include fontsize(9pt);
}

%monospace {font-family: monospace;}
%monospace {font-family: 'Ubuntu Mono 15', monospace;}
%numeric { font-feature-settings: "tnum";}


Expand Down
Loading