github/WhiteSur-gtk-theme
4
0
Fork 0
mirror of https://github.com/vinceliuice/WhiteSur-gtk-theme.git synced 2026-05-04 22:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed gnome 40.0 issues

Browse Source
This commit is contained in:
Vince
2021-04-04 16:39:10 +08:00
parent 4cf435af2e
commit 64e014cefb
42 changed files with 5288 additions and 2110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sass/_theme-options.scss Normal file
View File

@@ -0,0 +1,19 @@
//
// THEME OPTIONS
//
// Gnome shell version
$gnome_version: gs_version; // 3.38/old || 40.0/new
// Force nautilus styles to exclusively use colors instead of linear-gradients
$nautilus_use_colors: false;
// Nautilus sidebar sizes (when nautilus_use_colors is false)
$sidebar_size_default: 200px;
$sidebar_size_220: 220px;
$sidebar_size_240: 240px;
$sidebar_size_260: 260px;
$sidebar_size_280: 280px;
// Gnome-shell panel opacity
$panel_opacity: 0.16;

13
src/sass/_variables.scss
View File

@@ -1,3 +1,5 @@
@import 'theme-options';
$asset_suffix: if($variant == 'dark', '-dark', '');
$con_asset_suffix: if($variant=='dark', '', '-dark');
$extra_background_clip: if($variant == 'light', padding-box, border-box);
@@ -21,8 +23,6 @@ $secondary_opacity: 0.75;
$hint_opacity: 0.6;
$disabled_opacity: 0.45;
$panel_opacity: 0.16;
// sizes
$small_size: if($laptop == 'false', 24px, 20px);
$medium_size: if($laptop == 'false', 36px, 32px);
@@ -30,12 +30,6 @@ $large_size: if($laptop == 'false', 48px, 44px);
$menuitem_size: if($laptop == 'false', 32px, 28px);
$container_padding: if($laptop == 'false', 6px, 4px);
$sidebar_size_default: 200px;
$sidebar_size_220: 220px;
$sidebar_size_240: 240px;
$sidebar_size_260: 260px;
$sidebar_size_280: 280px;
// radiuses
$circular_radius: 9999px;
$bt_radius: 6px;
@@ -76,6 +70,3 @@ $shadow_6: 0 0 8px rgba(black, 0.2), 0 0 4px rgba(black, 0.3); // S
$text_shadow: 0 -1px rgba(white, 0.04), -1px 0 rgba(black, 0.05),
1px 0 rgba(black, 0.05), 0 1px rgba(black, 0.3),
0 2px rgba(black, 0.05); // text and icon shadow
// Force nautilus styles to exclusively use colors instead of linear-gradients
$nautilus_use_colors: false;

106
src/sass/gtk/_applications.scss
View File

@@ -65,11 +65,18 @@ window.background.csd { // gnome-terminal 3.32 setting
$nautilus_radius: $wm_radius + 2px;
$nautilus_sidebar_size: $sidebar_size_default;
$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
$dark_sidebar_bg $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px),
$base_color 100%);
$dark_sidebar_bg $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px),
$base_color 100%);
$nautilus_header_image_alt: linear-gradient(90deg, transparent 0%,
transparent $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px),
$base_color 100%);
$nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
$dark_sidebar_bg $nautilus_sidebar_size,
@@ -77,32 +84,33 @@ $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
transparent 100%);
$nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
$dark_sidebar_bg $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px),
$base_color 100%);
$dark_sidebar_bg $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
$base_color ($nautilus_sidebar_size + 1px),
$base_color 100%);
.nautilus-window {
&.background.csd {
border-radius: 0 0 $wm_radius $wm_radius;
@if $nautilus_use_colors {
@if $nautilus_use_colors == 'true' {
background-color: $dark_sidebar_bg;
} @else {
background-color: transparent;
background-image: $nautilus_background_image;
}
> headerbar.titlebar {
> headerbar.titlebar,
> deck > box > headerbar.titlebar {
box-shadow: inset 0 1px rgba(white, 0.1);
@if $nautilus_use_colors {
@if $nautilus_use_colors == 'true' {
background-color: $header_bg;
} @else {
border: none;
background-color: transparent;
background-image: $nautilus_header_image;
background-image: if($gnome_version == 'new', $nautilus_header_image_alt, $nautilus_header_image);
> .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
@@ -142,7 +150,8 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
}
}
> grid.horizontal > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
> grid.horizontal > paned.horizontal > separator,
> deck > box.vertical > paned.horizontal > separator { // Use paned separator to hide stack border-bottom-left-radius
border-left: none;
background-color: transparent;
background-image: image($base_color);
@@ -153,7 +162,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
&:dir(ltr) { margin-left: -1px; }
&:dir(rtl) { margin-right: -1px; }
@if $nautilus_use_colors {} @else {
@if $nautilus_use_colors == 'true' {} @else {
&:dir(ltr) { margin-left: 2px; }
&:dir(rtl) { margin-right: 2px; }
@@ -166,7 +175,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
}
placessidebar.sidebar {
@if $nautilus_use_colors {
@if $nautilus_use_colors == 'true' {
background-color: transparent;
&.frame { border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); }
} @else {
@@ -191,7 +200,7 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
&:backdrop { opacity: 0.85; }
@if $nautilus_use_colors {
@if $nautilus_use_colors == 'true' {
border-radius: $bt_radius;
margin: 0 6px;
padding: 2px 4px;
@@ -374,6 +383,14 @@ $nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
}
}
preferencesgroup { // gnome 40.0 preferences window
list {
@extend %circular_list;
row.activatable { @extend %circular_row; }
}
}
.nautilus-canvas-item { border-radius: 5px; }
// .view.nautilus-desktop,
@@ -1459,7 +1476,13 @@ hdyleaflet, leaflet, box.horizontal > stack.background {
row.activatable { @extend %circular_row; }
}
list > row.activatable { @extend %sidebar_row; }
> box.vertical > scrolledwindow > viewport.frame {
&,
> stack,
> stack > box.vertical {
> list > row.activatable { @extend %sidebar_row; }
}
}
}
list {
@@ -1531,7 +1554,8 @@ window.background.csd {
}
}
> hdyleaflet > box.vertical > stack.main-container { // Right side
> hdyleaflet > box.vertical > stack.main-container,
> leaflet > box.vertical > stack.main-container { // Right side
background-color: $base_color;
border-bottom-right-radius: $wm_radius;
}
@@ -1671,7 +1695,8 @@ window.background.csd {
box.horizontal > separator.sidebar,
hdyleaflet > separator.sidebar,
leaflet > separator.sidebar { // reset
leaflet > separator.sidebar,
leaflet > leaflet > separator.sidebar { // reset
@extend %side_separator;
}
@@ -1846,6 +1871,39 @@ notebook.main-notebook {
}
}
// gnome 40.0
tabbox {
background-color: darken($header_bg, 10%);
box-shadow: inset 0 -1px $borders_color;
> tab {
@extend %tabs_tab;
border-top: none;
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
button {
min-height: 20px;
min-width: 20px;
border-radius: 3px;
border: none;
padding: 0;
@extend %flat_button;
&:hover {
color: $fg_color;
background-color: rgba($borders_color, 0.1);
}
&:active, &:active:hover {
color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
background-color: rgba($borders_color, 0.2);
}
}
}
}
//
// Gnome Music
//
@@ -2470,6 +2528,8 @@ dialog.background.csd {
}
> box.vertical.dialog-vbox {
&.view { background: none; }
> grid.horizontal {
> scrolledwindow.frame { //removed ugly boders for nautilus batch renaming dialog
border: none;
@@ -3134,6 +3194,10 @@ window#GearyMainWindow.background.csd {
}
}
leaflet > leaflet > sidebar.separator {
@extend %side_separator;
}
&.maximized, &.tiled, &.fullscreen {
> overlay > box.vertical {
> paned {

107
src/sass/gtk/_common.scss
View File

@@ -1441,6 +1441,28 @@ headerbar {
box-shadow: none;
}
&.windowhandle {
viewswitcher button:not(.titlebutton):not(.suggested-action):not(.destructive-action) {
border-radius: 0;
margin-top: 0;
margin-bottom: 0;
}
> button.popup {
&:hover {
@include button(header-hover);
}
&:active, &:active:hover {
@include button(header-active);
}
&:checked {
@include button(header-checked);
}
}
}
// Selectionmode
.selection-mode &,
&.selection-mode {
@@ -1748,7 +1770,7 @@ headerbar, .titlebar {
transition-duration: 300ms;
}
&:active:hover, &:checked { color: $header_fg; }
// &:active:hover, &:checked { color: $header_fg; }
&:checked {
@include button(header-checked);
@@ -2170,11 +2192,18 @@ popover.background {
> list,
> .view,
> toolbar {
> toolbar,
> scrolledwindow > viewport > list {
border-style: none;
background-color: transparent;
}
> scrolledwindow > viewport > list {
margin: $container_padding;
row { border-radius: $bt_radius; }
}
&, .csd & {
&.osd, &.magnifier { @extend %osd; }
&.touch-selection { font: initial; }
@@ -2196,6 +2225,26 @@ cursor-handle {
//
// Notebooks and Tabs
//
%tabs_tab {
color: $disabled_fg_color;
background-color: transparentize($base_color, 1);
border: 1px solid transparent;
transition: all 150ms ease-out;
&:hover:not(:checked) {
color: mix($fg_color, $disabled_fg_color, 50%);
background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05));
border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
}
&:checked {
color: $fg_color;
background-color: $header_bg;
border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
}
}
notebook {
padding: 0;
// margin-top: -1px;
@@ -2348,22 +2397,7 @@ notebook {
}
tabs > tab {
color: $disabled_fg_color;
background-color: transparentize($base_color, 1);
border: 1px solid transparent;
transition: all 150ms ease-out;
&:hover:not(:checked) {
color: mix($fg_color, $disabled_fg_color, 50%);
background-color: if($variant == 'light', rgba(white, 0.2), rgba(white, 0.05));
border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
}
&:checked {
color: $fg_color;
background-color: $header_bg;
border-color: if($variant == 'light', darken($header_bg, 15%), lighten($header_bg, 5%));
}
@extend %tabs_tab;
// close button
button.flat {
@@ -3374,24 +3408,33 @@ filechooserbutton:drop(active) {
//
// Sidebar
//
%sidebar_left {
border-right: 1px solid $borders_color;
border-left-style: none;
}
%sidebar_right {
border-left: 1px solid $borders_color;
border-right-style: none;
}
.sidebar {
border-style: none;
background-color: $bg_color;
@at-root %sidebar_left,
&:dir(ltr),
&.left,
&.left:dir(rtl) {
border-right: 1px solid $borders_color;
border-left-style: none;
}
@at-root %sidebar_right,
&:dir(rtl),
&.right {
border-left: 1px solid $borders_color;
border-right-style: none;
}
// &:dir(ltr),
// &.left,
// &.left:dir(rtl) {
// border-right: 1px solid $borders_color;
// border-left-style: none;
// }
//
// &:dir(rtl),
// &.right {
// border-left: 1px solid $borders_color;
// border-right-style: none;
// }
list {
background-color: transparent;