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

Jump to bottom

Auto update new upstream snapshot for GNOME Shell #82

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

Auto update new upstream snapshot for GNOME Shell #82

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
7 changes: 5 additions & 2 deletions gnome-shell/upstream/gnome-shell-sass/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,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 @@ -308,10 +311,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
7 changes: 5 additions & 2 deletions gnome-shell/upstream/gnome-shell-sass/_dock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,9 @@ $dock_color: $panel_bg_color;

$fg:$system_fg_color;
$normal_bg: transparent;
$bg: transparentize(lighten($dock_color, 15%), 0.25);
$focus_bg: transparentize($fg, .83);
$bg: transparentize($fg, .90);
$checked_bg: transparentize($fg, .75);

.overview-icon {
@extend %tile;
Expand All @@ -541,7 +543,8 @@ $dock_color: $panel_bg_color;
&:focus .overview-icon { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
&:hover .overview-icon { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
&:active .overview-icon { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
&:checked .overview-icon { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: true);}
&:checked .overview-icon { @include button(checked, $tc:$fg, $c:$checked_bg, $style: flat, $always_dark: true);}
&.focused .overview-icon { @include button(active, $tc: $fg, $c:$focus_bg, $style: flat, $always_dark: true);}
}

// running app dot
Expand Down
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/_drawing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,11 @@
} @else {
@include button(normal, $c:$bg);
}
&:focus,
&: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);}
}
Expand Down
1 change: 1 addition & 0 deletions gnome-shell/upstream/gnome-shell-sass/_yaru-colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $focus_border_color: lighten($accent_bg_color, 14%);
$alt_borders_color: if($variant=='light', darken($bg_color, 24%), darken($bg_color, 10%));

$system_borders_color: $yaru_borders_color_dark; // Yaru: use our definition
$system_overlay_bg_color: $dash_background_color; // Yaru - Use system bg color for overlay items

// card elements
$card_bg_color: if($variant =='light', $light_1, lighten($bg_color, 7%));
Expand Down
7 changes: 1 addition & 6 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,7 @@ $app_folder_size: 720px;
width: 5px;
border-radius:5px;
background-color: $system_fg_color;

@if $contrast == 'high' {
margin-bottom: 4px;
} @else {
margin-bottom: 2px;
}
offset-y: 6px;
}

.app-folder-dialog-container {
Expand Down
5 changes: 0 additions & 5 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,5 @@

@if $contrast == 'high' {
icon-shadow: none;
background-color: $osd_bg_color;
padding: $base_padding * 2;
border-radius: $modal_radius;
border: 2px solid $hc_inset_color;
margin: $base_padding * 3;
}
}
8 changes: 4 additions & 4 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

.datemenu-popover {
border-radius: $base_border_radius * 1.5 + $base_padding * 3;
border-radius: $yaru_menu_border_radius;
}

// calendar menu side column
Expand Down Expand Up @@ -274,10 +275,9 @@
spacing-columns: $base_padding * 2;

.weather-forecast-time {
@extend %numeric;
@include fontsize(10pt);
padding-top: 0.2em;
padding-bottom: 0.4em;
@extend %smaller;
padding-top: $base_padding;
padding-bottom: $base_padding;
}
.weather-forecast-icon {
icon-size: $large_scalable_icon_size;
Expand Down
11 changes: 9 additions & 2 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Dash */

// uses system colors
$dash_background_color: $system_overlay_bg_color !default; // Yaru: we define those colors in _colors.scss for _dock.scss to use it
$dash_background_color: $system_overlay_bg_color;

$dash_placeholder_size: 32px;
$dash_padding: $base_padding * 2;
Expand All @@ -11,7 +11,9 @@ $dash_spacing: $base_margin * 0.5;

// container for the dash
#dash {
margin-top: $dash_edge_offset;
// a bit of spacing so that dash doesn't touch the screen edges
padding-left: $base_padding;
padding-right: $base_padding;

// background behind item container
.dash-background {
Expand Down Expand Up @@ -70,6 +72,11 @@ $dash_spacing: $base_margin * 0.5;
// running app dot
.app-grid-running-dot {
// manually position the dot within the dash item
@if $contrast == 'high' {
offset-y: -$dash_padding - 1px; // don't draw dot directly on inset
} @else {
// offset-y: -$dash_padding; // Yaru: we manage this through margin
}
margin-bottom: $dash_padding + $dash_edge_offset - 3px; // 3px = size of dot (5px) subtracted from its translationY from appDisplay.js

// margin-bottom: 13px; // hardcoded - Yaru change: move dot a bit down
Expand Down
36 changes: 24 additions & 12 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_login-lock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ $_gdm_dialog_width: 25em;
text-align: center;
}

.login-dialog-message-hint, .login-dialog-message {
color: darken($_gdm_fg, 10%);
min-height: 2.75em;
}

.login-dialog-user-selection-box {
// padding to ensure the box doesn't overlap the panel
padding-top: 4em;
Expand Down Expand Up @@ -196,7 +201,6 @@ $_gdm_dialog_width: 25em;
}

&:logged-in {
// color border for logged-in user
.user-icon {
border-color: $selected_bg_color;
StIcon {
Expand Down Expand Up @@ -224,32 +228,32 @@ $_gdm_dialog_width: 25em;
}

.web-login-spinner {
background-color: rgba(0, 0, 0, 0.5);
border: 5px rgba(0, 0, 0, 0.0);
color: $osd_fg_color;
background-color: transparentize($osd_bg_color, 0.5);
border: 5px transparent;
border-radius: 50px;
}

.web-login-title-label {
@include fontsize($base_font_size);
color: darken($_gdm_fg, 30%);
color: if($variant =='dark', darken($fg_color, 30%), lighten($fg_color, 20%));
}

.web-login-url-label {
@include fontsize($base_font_size);
@extend %monospace;
color: $_gdm_fg;
color: $fg_color;
text-align: center;
}

.web-login-code-title-label {
@include fontsize($base_font_size);
@include fontsize($base_font_size);
color: $_gdm_fg;
color: $fg_color;
}

.web-login-code-label {
@include fontsize($base_font_size);
color: $_gdm_fg;
color: $fg_color;
font-weight: bold;
}

Expand All @@ -264,15 +268,15 @@ $_gdm_dialog_width: 25em;

.web-login-intro-button-label {
@include fontsize($base_font_size + 5);
color: $_gdm_fg;
color: $fg_color;
height: 3em;
text-align: center;
font-weight: bold;
}

.web-login-intro-button {
@include fontsize($base_font_size);
color: $_gdm_fg;
color: $fg_color;
height: 3em;
text-align: center;
border-radius: $base_border_radius * 4;
Expand Down Expand Up @@ -503,8 +507,16 @@ $_gdm_dialog_width: 25em;

// QR Code
.qr-code {
background: black;
@if ($variant == 'light') {
$qrcode_bg_color: mix($fg_color, $bg_color, 8%);
background-color: $qrcode_bg_color;
border-color: $qrcode_bg_color;
color: $fg_color;
} @else {
background-color: $_gdm_fg;
border-color: $_gdm_fg;
color: $_gdm_bg;
}
border-radius: $base_border_radius * .5;
border-color: white;
border-width: 1em;
}
8 changes: 4 additions & 4 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@

// icon size and color
icon-size: $base_icon_size * 3; // 48px
-st-icon-style: symbolic;

// a small symbolic icon on a circle background
&.message-themed-icon {
border-radius: $forced_circular_radius; // is circular
background-color: transparentize($fg_color, 0.8);
icon-size: $base_icon_size;
border-radius: $forced_circular_radius;
background-color: transparentize($fg_color, .93);
icon-size: $scalable_icon_size;
min-width: $base_icon_size * 3;
min-height: $base_icon_size * 3;
}
Expand Down
6 changes: 1 addition & 5 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/* OVERVIEW */

.controls-manager, .secondary-monitor-workspaces {
.secondary-monitor-workspaces {
spacing: $base_padding * 2;
}

#overviewGroup {
background-color: $system_base_color;
}

.overview-controls {
padding-bottom: $base_margin * 8;
}
1 change: 1 addition & 0 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ $submenu_bg_color: lighten($menu_bg_color, 7%);
padding: $base_padding;
background-color: $bg_color;
border-radius: $modal_radius * 1.25;
border-radius: $yaru_menu_border_radius;
border: 1px solid $outer_borders_color;
box-shadow: 0 2px 4px 0 $shadow_color;
}
Expand Down
1 change: 1 addition & 0 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_quick-settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.quick-settings {
padding: $base_padding * 3;
border-radius: $modal_radius * 2.25;
border-radius: $yaru_menu_border_radius;

.icon-button, .button {
padding: $base_padding * 1.75;
Expand Down
3 changes: 1 addition & 2 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// content
.search-section-content {
background-color: $dash_background_color; // Yaru: use same background as dash
background-color: $system_overlay_bg_color;
color: $system_fg_color;
border-radius: $modal_radius * 1.5;
padding: $base_padding * 2;
Expand All @@ -49,7 +49,6 @@

.grid-search-results {
spacing: $base_padding * 5;
margin:0 $base_margin * 3;
}

// Search results with icons
Expand Down
19 changes: 11 additions & 8 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_slider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ $slider_size: $scalable_icon_size;
$slider_size: to_em(18px);; // Yaru change: larger slider cause to border in light theme

.slider {
color: if($variant == 'light', $fg_color, darken($fg_color, 9%));

// slider trough
-barlevel-height: 4px;
-barlevel-background-color: transparentize($fg_color, 0.8); //background of the trough
-barlevel-border-width: 2px;
-barlevel-border-color: transparent; // trough border color
-barlevel-background-color: transparentize($fg_color, 0.9);
// fill style
-barlevel-active-background-color: $progress_bg_color; // Yaru change: we detached progress from selected
-barlevel-active-border-color: transparent;
// overfill style (red in this case)
-barlevel-overdrive-color: $destructive_color;
-barlevel-overdrive-border-color: transparent; //trough border when red;
-barlevel-overdrive-separator-width:1px;
// slider handler
// -slider-handle-border-width: 0;
Expand All @@ -26,8 +25,12 @@ $slider_size: to_em(18px);; // Yaru change: larger slider cause to border in lig
color: darken(white, 1%); // Yaru change: adapt knob to gtk
height: $slider_size + to_em(2px); // Yaru change: increase height due to border

// hc style
@if $contrast == 'high' {
-barlevel-background-color: transparentize($fg_color, 0.6);
}
// hc style
@if $contrast == 'high' {
-barlevel-background-color: transparentize($fg_color, 0.6);
}

&:hover {
color: if($variant == 'light', lighten($fg_color, 7%), $fg_color);
}
}
13 changes: 13 additions & 0 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_window-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ $window_close_button_color: transparentize(lighten($system_bg_color, 7%), .02);
spacing: $base_padding;
}

// Window icons
.window-icon {
// styled only with .icon-dropshadow
// but has a different style in high-contrast
@if $contrast == 'high' {
background-color: $osd_bg_color;
padding: $base_padding * 2;
border-radius: $modal_radius;
border: 2px solid $hc_inset_color;
margin: $base_padding * 3;
}
}

// Window titles
.window-caption {
@extend %tooltip;
Expand Down
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Workspace Switcher */

$ws_indicator_height: 48px;
$ws_indicator_height: 32px;
$ws_dot_active: $ws_indicator_height / 3;
$ws_dot_inactive: $ws_indicator_height / 6;

Expand Down
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/widgets/_workspace-thumbnails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
border-radius: $base_border_radius * 0.5;
border: 1px solid transparent;

background-color: $dash_background_color; // Yaru: use same background as dash
background-color: $system_overlay_bg_color; // Yaru: use same background as dash
border: 1px solid $system_borders_color; // Yaru: use same border as dash

@if $contrast == 'high' {
Expand Down