Skip to content

Commit

Permalink
New upstream snapshot for GNOME Shell (ubuntu#2724)
Browse files Browse the repository at this point in the history
Co-authored-by: didrocks <didrocks@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and didrocks committed Mar 21, 2021
1 parent bee3ffd commit 76d515d
Show file tree
Hide file tree
Showing 24 changed files with 326 additions and 206 deletions.
36 changes: 36 additions & 0 deletions gnome-shell/upstream/carousel-arrow-back-24-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions gnome-shell/upstream/carousel-arrow-next-24-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 0 additions & 36 deletions gnome-shell/upstream/data/gnome-shell-theme.gresource.xml

This file was deleted.

25 changes: 25 additions & 0 deletions gnome-shell/upstream/gnome-shell-high-contrast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,28 @@ stage {
background-image: url("resource:///org/gnome/shell/theme/toggle-off-hc.svg");
&:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-hc.svg"); }
}

//force opaque panel
#panel {
&.login-screen,
&.unlock-screen,
&:overview {
background-color: #000;

.panel-corner {
-panel-corner-opacity: 1;
}
}

.panel-button {
color: #fff !important;
}
}

//thumbnail app icons no dropshadow and forced color
.window-picker .icon-dropshadow {
icon-shadow: none;
background-color: $osd_bg_color;
padding: $base_padding * 2;
border-radius: $modal_radius;
}
1 change: 1 addition & 0 deletions gnome-shell/upstream/gnome-shell-sass/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ $osd_borders_color: transparentize(black, 0.3);
$osd_outer_borders_color: transparentize(white, 0.84);

$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));
$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color

//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
Expand Down
7 changes: 3 additions & 4 deletions gnome-shell/upstream/gnome-shell-sass/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $base_margin: 4px;
$base_spacing: 6px;

// border radii
$base_border_radius: 5px;
$base_border_radius: 8px;

$modal_radius:$base_border_radius * 2;

Expand Down Expand Up @@ -76,7 +76,7 @@ stage {
%osd_panel {
color: $osd_fg_color;
background-color: $osd_bg_color;
border: 1px solid $osd_outer_borders_color;
//border: 1px solid $osd_outer_borders_color;
border-radius: $base_border_radius * 2 + 4px;
padding: $base_padding * 2;
}
Expand All @@ -85,8 +85,7 @@ stage {
// for the dash and workspace switcher
%overview_panel {
color: $osd_fg_color;
background-color: transparentize($osd_bg_color, 0.2);
border: 1px solid $osd_outer_borders_color;
background-color: transparentize($osd_fg_color, 0.9);
}

// icon tiles
Expand Down
3 changes: 2 additions & 1 deletion gnome-shell/upstream/gnome-shell-sass/_drawing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@

&:drop {
.overview-icon {
background-color: transparentize($selected_bg_color, .15);
border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
background-color: transparentize($selected_bg_color, .8);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $osd_borders_color: rgba(0,0,0, 0.7);
$osd_outer_borders_color: rgba(255,255,255, 0.1);

$shadow_color: rgba(0,0,0, 0.1);
$system_bg_color: desaturate(#241f31,100%); //neutralize the HIG color

//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
Expand Down
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
@import 'widgets/window-picker';
@import 'widgets/search-entry';
@import 'widgets/search-results';
@import 'widgets/app-grid';
@import 'widgets/dash';
@import 'widgets/app-grid';
@import 'widgets/workspace-thumbnails';
// A11y / misc
@import 'widgets/a11y';
Expand Down
70 changes: 47 additions & 23 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ $app_icon_size: 96px;

// app icons
.icon-grid {
row-spacing: $base_spacing * 6;
column-spacing: $base_spacing * 6;
row-spacing: $base_spacing * 2;
column-spacing: $base_spacing * 2;
max-row-spacing: $base_spacing * 12;
max-column-spacing: $base_spacing * 12;
page-padding-top: $base_padding * 4;
page-padding-bottom: $base_padding * 4;
page-padding-left: $base_padding * 2;
page-padding-right: $base_padding * 2;
}

/* App Icons */
Expand All @@ -30,16 +34,15 @@ $app_grid_fg_color: #fff;

/* App Folders */
.app-well-app.app-folder {
background-color: transparentize($osd_bg_color, 0.8);
background-color: darken($system_bg_color, 3%);
border-radius: $base_border_radius + 4px; // same as %icon_tile
}

// expanded folder
.app-folder-dialog {
.app-folder-dialog { //style like the dash
border-radius: $modal_radius * 1.5;
border: 1px solid $osd_outer_borders_color;
background-color: transparentize(darken($osd_bg_color,10%), 0.05);
padding: 12px;
background-color: $dash_background_color;
padding: 12px 0px 12px 0px;

& .folder-name-container {
padding: 24px 36px 0;
Expand Down Expand Up @@ -71,14 +74,14 @@ $app_grid_fg_color: #fff;
& .icon-grid {
row-spacing: $base_spacing * 2;
column-spacing: $base_spacing * 5;
page-padding-top: 0;
page-padding-bottom: 0;
page-padding-left: 0;
page-padding-right: 0;
}

& .page-indicators {
margin-bottom: 18px;

.page-indicator {
padding: 15px 12px;
}
}
}
.app-folder-dialog-container {
Expand All @@ -87,13 +90,6 @@ $app_grid_fg_color: #fff;
height: 620px;
}

.app-folder-icon {
padding: $base_padding;
spacing-rows: $base_spacing;
spacing-columns: $base_spacing;
}


// Running app indicator (also shown in dash)
.app-well-app-running-dot {
height: 5px;
Expand All @@ -119,7 +115,7 @@ $app_grid_fg_color: #fff;

// App Grid pagination indicators
.page-indicator {
padding: 15px 20px;
padding: $base_padding $base_padding * 2 0;

.page-indicator-icon {
width: 10px;
Expand All @@ -129,10 +125,8 @@ $app_grid_fg_color: #fff;
}
}

// Some hacks I don't even know
.all-apps {
// horizontal padding to make sure scrollbars or dash don't overlap content
padding: 0px 88px 10px 88px;
.apps-scroll-view {
padding: 0;
}

// shutdown and other actions in the grid
Expand All @@ -142,3 +136,33 @@ $app_grid_fg_color: #fff;
border-radius: 99px;
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: 15px 0px 0px 15px;
}

&.previous:ltr,
&.next:rtl {
background-gradient-start: transparent;
background-gradient-end: rgba(255, 255, 255, 0.05);
background-gradient-direction: horizontal;
border-radius: 0px 15px 15px 0px;
}
}

.page-navigation-arrow {
margin: 6px;
width: 24px;
height: 24px;
}
2 changes: 1 addition & 1 deletion gnome-shell/upstream/gnome-shell-sass/widgets/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

// Dropshadow for large icons
.icon-dropshadow {
icon-shadow: 0 1px 2px rgba(black, 0.4);
icon-shadow: 0 1px 5px rgba(black, 0.8);
}
6 changes: 3 additions & 3 deletions gnome-shell/upstream/gnome-shell-sass/widgets/_calendar.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* Date/Time Menu */

.clock-display-box {
spacing: $base_spacing / 2;
spacing: 2px;

.clock {
padding-left: $base_padding;
padding-right: $base_padding;
padding-left: $base_padding * 2;
padding-right: $base_padding * 2;
}
}

Expand Down
Loading

0 comments on commit 76d515d

Please sign in to comment.