isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: tidy the syntax for app-grid; fix border radii

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/904
This commit is contained in:
Sam Hewitt 2019-12-19 15:56:45 -05:00 committed by Florian Müllner
parent d713d78745
commit f2e9757862
5 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/theme/gnome-shell-sass/widgets/_app-grid.scss
View File

@ -40,7 +40,6 @@ $app_grid_fg_color: #fff;
color: $app_grid_fg_color !important;
}
&:hover,
&:selected {
.overview-icon {
background-color: transparentize($osd_bg_color,0.7);
@ -48,11 +47,13 @@ $app_grid_fg_color: #fff;
}
}
&:hover .overview-icon,
&:focus .overview-icon,
&:selected .overview-icon {
background-color: transparentize($osd_fg_color,0.9);
color: $osd_fg_color;
&:hover,
&:focus,
&:selected {
.overview-icon {
background-color: transparentize($osd_fg_color,0.9);
color: $osd_fg_color;
}
}
&:focus {
@ -92,7 +93,7 @@ $app_grid_fg_color: #fff;
-arrow-rise: 11px;
}
.app-folder-popup-bin { padding: 5px; }
.app-folder-popup-bin { padding: $base_padding - 1px; }
.app-folder-icon {
padding: $base_padding;
@ -114,7 +115,7 @@ $app_grid_fg_color: #fff;
.rename-folder-popup {
.rename-folder-popup-item {
spacing: $base_spacing;
&:ltr, &:rtl { padding: 0, $base_padding * 2; }
&:ltr, &:rtl { padding: 0 $base_padding * 2; }
}
}
@ -129,20 +130,13 @@ $app_grid_fg_color: #fff;
padding: 15px 20px;
.page-indicator-icon {
width: 12px;
height: 12px;
background-color: transparent;
border: 2px solid rgba(255, 255, 255, 0.4);
border-radius: 12px;
width: 10px;
height: 10px;
border-radius: 10px; // the same as height&width
background-color: white;
}
&:hover .page-indicator-icon { border-color: white; }
&:active .page-indicator-icon { border: none; margin: 2px; background-color: white; }
&:checked .page-indicator-icon,
&:checked:active .page-indicator-icon { background-color: white;}
}
// Some hacks I don't even know
.all-apps,
.frequent-apps > StBoxLayout {

8
data/theme/gnome-shell-sass/widgets/_dialogs.scss
View File

@ -5,7 +5,7 @@
@extend %bubble_panel;
.modal-dialog-content-box {
padding: 24px;
padding: $base_padding * 4;
}
.run-dialog-entry { width: 20em; margin-bottom: 6px; }
@ -25,7 +25,7 @@
.mount-dialog-subject,
.end-session-dialog-subject { //this should be a generic header class
@include fontsize($base_font_size * 1.3);
@include fontsize($base_font_size + 3);
}
.modal-dialog-linked-button {
@ -149,10 +149,6 @@
padding-bottom: 8px;
}
.hidden {
color: rgba(0,0,0,0);
}
.prompt-dialog-null-label {
@include fontsize($base_font_size - 1);
padding-bottom: 8px;

6
data/theme/gnome-shell-sass/widgets/_keyboard.scss
View File

@ -16,10 +16,8 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
padding: $base_padding;
.page-indicator-icon {
width: 6px;
height: 6px;
&:checked {
}
width: 8px;
height: 8px;
}
}
}

6
data/theme/gnome-shell-sass/widgets/_misc.scss
View File

@ -49,7 +49,11 @@
border: 5px solid $selected_bg_color;
}
// Text
.headline { @include fontsize($base_font_size + 1); }
.lightbox { background-color: black; }
.flashspot { background-color: white; }
// Hidden
.hidden { color: rgba(0,0,0,0);}

39
data/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
View File

@ -5,7 +5,6 @@
.workspace-switcher-container {
@extend %osd_panel;
box-shadow: 0 2px 10px 2px rgba(0,0,0,0.2);
}
.workspace-switcher {
@ -14,25 +13,25 @@
border-radius: 0;
padding: 0;
spacing: $base_spacing * 2;
}
.ws-switcher-box {
// background: transparent;
background: transparent;
height: 50px;
background-size: 32px;
border: 1px solid transparentize($osd_fg_color,0.9);
border-radius: $base_border_radius + 3px;
}
.ws-switcher-box {
// background: transparent;
background: transparent;
height: 50px;
background-size: 32px;
border: 1px solid transparentize($osd_fg_color,0.9);
border-radius: $base_border_radius + 3px;
}
// active workspace in the switcher
.ws-switcher-active-up,
.ws-switcher-active-down,
.ws-switcher-active-left,
.ws-switcher-active-right {
background-color: $selected_bg_color;
border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
color: $selected_fg_color;
}
// active workspace in the switcher
.ws-switcher-active-up,
.ws-switcher-active-down,
.ws-switcher-active-left,
.ws-switcher-active-right {
background-color: $selected_bg_color;
border: 1px solid if($variant=='light', darken($selected_bg_color, 8%), lighten($selected_bg_color, 5%));
color: $selected_fg_color;
}
/* Workspace pager */
@ -44,10 +43,12 @@
spacing: $base_spacing;
padding: $base_padding;
border-radius: $modal_radius 0 0 $modal_radius;
border-right-width: 0 !important;
//fixme: can't have non uniform borders :(
border-top-left-radius:0 !important;
border-bottom-left-radius:0 !important;
border-right-width: 0 !important;
&:rtl {
border-radius: 0 $modal_radius $modal_radius 0;
border-left-width: 0 !important;