Gnome-Shell: update upstream to 42.rc

This commit is contained in:
Daniel Ruiz de Alegría
2022-03-07 18:55:58 +01:00
parent e8b75a1302
commit 7c41266871
10 changed files with 255 additions and 229 deletions
@@ -84,6 +84,7 @@ stage {
%tile {
border-radius: $base_border_radius * 2; // 16px
padding: $base_padding;
spacing: $base_padding;
border: 2px solid transparent;
transition-duration: 100ms;
text-align: center;
@@ -122,7 +123,9 @@ $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($
%bubble_button {
padding: $base_padding * 2;
font-weight: bold !important;
margin-right: 1px;
&:ltr {margin-right: 1px;}
&:rtl {margin-left: 1px;}
@include button(normal, $c:$bubble_buttons_color);
&:insensitive { @include button(insensitive, $c:$bubble_buttons_color);}
@@ -146,11 +149,12 @@ $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($
&:last-child:rtl {
border-radius: 0 0 0 $bubble_button_radius;
margin-right: 0 !important;
margin-left: 0 !important;
}
&:first-child:last-child {
border-radius: 0 0 $bubble_button_radius $bubble_button_radius !important;
margin-left: 0 !important;
margin-right: 0 !important;
}
}
@@ -6,12 +6,12 @@ $app_icon_size: 96px;
.icon-grid {
row-spacing: $base_padding * 2;
column-spacing: $base_padding * 2;
max-row-spacing: $base_padding * 12;
max-column-spacing: $base_padding * 12;
max-row-spacing: $base_padding * 7;
max-column-spacing: $base_padding * 7;
page-padding-top: $base_padding * 4;
page-padding-bottom: $base_padding * 4;
page-padding-left: $base_padding * 2;
page-padding-right: $base_padding * 2;
page-padding-left: $base_padding * 3;
page-padding-right: $base_padding * 3;
}
/* App Icons */
@@ -20,9 +20,7 @@ $app_icon_size: 96px;
.app-well-app {
@include overview_icon($osd_fg_color);
.overview-icon {
padding: $base_padding*2;
}
.overview-icon { padding: $base_padding*2;}
.overview-icon.overview-icon-with-label {
> StBoxLayout {
spacing: $base_padding;
@@ -39,7 +37,6 @@ $app_icon_size: 96px;
.app-folder-dialog {
border-radius: $modal_radius*2;
background-color: $dash_background_color;
padding: 12px 0px 12px 0px;
& .folder-name-container {
padding: 24px 36px 0;
@@ -56,15 +53,11 @@ $app_icon_size: 96px;
& .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
& .edit-folder-button {
@include button(undecorated);
@extend %button;
padding: 0;
width: 36px;
height: 36px;
border-radius: 18px;
&:focus {@include button(focus);}
&:hover {@include button(hover);}
&:active {@include button(active);}
border-radius: 99px;
& > StIcon { icon-size: $base_icon_size }
}
}
@@ -85,8 +78,8 @@ $app_icon_size: 96px;
.app-folder-dialog-container {
padding: $base_padding*2;
width: 620px;
height: 620px;
width: 640px;
height: 640px;
}
// Running app indicator (also shown in dash)
@@ -8,7 +8,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
// container for the dash
#dash {
@extend %caption;
margin: 2em;
margin-top: $dash_padding;
.placeholder {
// background-image: url("assets/dash-placeholder.svg");
@@ -24,7 +24,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
// Running app indicator (also shown in app grid)
.app-well-app-running-dot {
margin-bottom: 15px; // hardcoded
margin-bottom: 14px; // hardcoded
}
}
@@ -34,24 +34,34 @@ $dash_border_radius: $modal_radius + $dash_padding;
border-radius: $dash_border_radius;
padding: $dash_padding;
spacing: $base_padding;
margin-bottom: $dash_padding;
}
// items on the dash
.dash-item-container {
> * {margin: 0 2px;}
&:ltr:first-child {margin-left: 0;}
&:rtl:first-child {margin-right: 0;}
// each app item on the dash
.app-well-app .overview-icon {
margin: 0 4px;
padding: $base_padding;
}
// show apps button
.show-apps { @include overview_icon($osd_fg_color);}
.show-apps, .app-well-app {
padding-bottom: $dash_padding;
}
}
// separator between favourites and running apps
.dash-separator {
width: 1px;
margin: 0 $base_margin;
background-color: $borders_color;
margin-bottom: $dash_padding;
}
// OSD Tooltip
@@ -3,7 +3,7 @@
// main list
.message-list {
width: 32em;
width: 29em;
border: solid $borders_color;
// padding and margins to account for scrollbar
@@ -67,11 +67,9 @@
// icon container
.message-icon-bin {
padding: ($base_padding * 3);
padding-right:$base_padding;
&:rtl {
padding-right:$base_padding;
}
&:ltr {padding-right:$base_padding;}
&:rtl {padding-left:$base_padding;}
// icon size and color
> StIcon {
@@ -2,7 +2,7 @@
// the popover itself
.popup-menu-boxpointer {
margin: $base_margin; // used as distance from the screen edge
-arrow-rise: $base_margin+2px; // distance from the panel & screen edge
}
// container of the popover menu
@@ -12,7 +12,6 @@
//.popup-status-menu-item {font-weight: normal; color: pink;} //dunno what that is
&.panel-menu {
-boxpointer-gap: $base_margin+2px; // distance from the panel
margin-bottom: 1.75em; // so it doesn't touch the bottom of the screen
}
}
@@ -20,7 +19,6 @@
// popover content
.popup-menu-content {
padding: $base_padding;
// account for margin oddities
border-radius: $modal_radius - 2px;
border: 1px solid $borders_edge;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
@@ -31,9 +29,13 @@
.popup-menu-item {
padding: $base_padding*1.5 $base_padding*2;
border-radius: $base_border_radius;
spacing: $base_padding;
transition: 0.2s all ease;
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;}
@@ -55,6 +57,12 @@
}
&:insensitive {color: transparentize($fg_color,0.5);}
// add margin to switches in menu items
.toggle-switch {
&:ltr { margin-left: $base_margin;}
&:rtl { margin-right: $base_margin;}
}
}
@@ -71,8 +79,6 @@
}
.popup-menu-arrow {
&:ltr {margin-right: $base_margin;}
&:rtl {margin-left: $base_margin;}
}
@@ -104,7 +110,7 @@
.popup-menu-section {
.popup-menu-item:last-child {
&:hover,&:focus {border-radius: 0;}
&:hover,&:focus { border-radius: 0;}
}
&:last-child .popup-menu-item:last-child {
border-radius: 0 0 $base_border_radius $base_border_radius;
@@ -118,14 +124,16 @@
width: 1.2em;
text-align: center !important;
&:ltr {text-align: right;};
&:rtl {text-align: left;};
&:ltr { text-align: right;}
&:rtl { text-align: left;}
}
// separator
.popup-separator-menu-item {
padding:0;
margin: 6px 0;
padding:0 !important;
&:ltr { margin-right: $base_margin;}
&:rtl { margin-left: $base_margin;}
.popup-separator-menu-item-separator {
height: 1px; //not really the whole box
@@ -136,11 +144,14 @@
width: 0 !important;
}
// separators in submenus
.popup-sub-menu & {
padding: 0;
margin-right: 2.5em !important; // account for ornament
background-color: transparent;
// account for ornament
&:ltr { margin-right: 2.5em;}
&:rtl { margin-left: 2.5em;}
.popup-separator-menu-item-separator {
background-color: lighten($borders_color, 7%);
}
@@ -149,7 +160,7 @@
// desktop background menu
.background-menu {
-boxpointer-gap: $base_margin;
-boxpointer-gap: 0px;
-arrow-rise: 0px; // hide the beak on the menu
}
@@ -170,19 +181,14 @@
// 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: $base_margin*2;}
&:rtl { margin-right: $base_margin*2;}
&:ltr { margin-left: 1em;}
&:rtl { margin-right: 1em;}
}
}
// right-click (and panel) app menu
.app-menu {
max-width: 27.25em;
.popup-menu-content { margin: $base_margin;}
&.panel-menu {
.popup-menu-content { margin: 0;} // avoid doubling up margin
}
// this is unneeded at the top-level in this menu, hide it
.popup-menu-ornament { width: 0 !important; }
@@ -1,15 +1,18 @@
/* Search */
// search overview container
#searchResults {
margin: 0 $base_margin;
}
#searchResultsContent {
max-width: 1024px;
spacing: $base_margin * 2;
max-width: 1072px;
}
// search results sections "the boxes"
.search-section {
// This should be equal to #searchResultsContent spacing
spacing: $base_margin * 2;
spacing: $base_padding*3;
// separator (unstyled)
.search-section-separator {
@@ -23,27 +26,24 @@
background-color: lighten($system_bg_color, 5%);
border-radius: $modal_radius*1.5;
border: 1px solid $osd_outer_borders_color;
box-shadow: none;
text-shadow: none;
color: $osd_fg_color;
padding: $base_padding*2;
margin: $base_margin;
// This is the space between the provider icon and the results container
margin:0 $base_margin*3;
}
%search_section_content_item {
@include tile_button($osd_fg_color);
margin: $base_margin;
border-radius: $base_border_radius !important;
border-radius: $base_border_radius+3px;
}
// "no results" text
.search-statustext {
@extend %large_title;
@extend %title_1;
}
.grid-search-results {
spacing: $base_padding * 6;
spacing: $base_padding*5;
margin:0 $base_margin*3;
}
// Search results with icons
@@ -54,6 +54,8 @@
// search result provider
.search-provider-icon {
@extend %search_section_content_item;
&:ltr {margin-right: $base_margin;}
&:rtl {margin-left: $base_margin;}
// content
.list-search-provider-content {
@@ -25,8 +25,9 @@ $switcher_border_radius: $modal_radius + 8px;
// each item in the list
.item-box {
@include tile_button($osd_fg_color);
// override over style so mouse doesn't steal focus
&:hover {background: none;}
}
.separator {
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
YELLOW='\033[0;33m'
RESET='\033[0m'
VERSION=6b60a189fded722ae37a7d3e94d51a509a7d2df1
VERSION=42.rc
echo
printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"