From 58606ca472a242403d26553b6d8f77d520d73e6a Mon Sep 17 00:00:00 2001 From: Vince Date: Tue, 8 Nov 2022 12:29:37 +0800 Subject: [PATCH 1/5] update --- install.sh | 4 +--- src/sass/gtk/_common-3.0.scss | 5 +---- src/sass/gtk/apps/_xfce.scss | 10 ++++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index f22be9b4..3c7d0347 100755 --- a/install.sh +++ b/install.sh @@ -509,9 +509,7 @@ theme_tweaks() { } uninstall_link() { - [[ -L "${HOME}/.config/gtk-4.0/assets" ]] && rm -rf "${HOME}/.config/gtk-4.0/assets" && echo -e "\nUninstall ${HOME}/.config/gtk-4.0/assets link ..." - [[ -L "${HOME}/.config/gtk-4.0/gtk.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk.css" && echo -e "Uninstall ${HOME}/.config/gtk-4.0/gtk.css link ..." - [[ -L "${HOME}/.config/gtk-4.0/gtk-dark.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk-dark.css" && echo -e "Uninstall ${HOME}/.config/gtk-4.0/gtk-dark.css link ..." + rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css} && echo -e "\nUninstall ${HOME}/.config/gtk-4.0 links ..." } link_libadwaita() { diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 9c7f6782..e50143a1 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1631,14 +1631,11 @@ menubar, &:backdrop { color: $titlebar-text-secondary; + background-color: $titlebar-backdrop; } .csd & { transition: $transition; - - &:backdrop { - background-color: $titlebar-backdrop; - } } > menuitem { diff --git a/src/sass/gtk/apps/_xfce.scss b/src/sass/gtk/apps/_xfce.scss index 98838afd..556acb41 100644 --- a/src/sass/gtk/apps/_xfce.scss +++ b/src/sass/gtk/apps/_xfce.scss @@ -46,6 +46,16 @@ wnck-pager { &:selected { background-color: $primary; } } +#xfce4-mpc-plugin-26 { + > frame > border { + border: none; + } +} + +#xfce-panel-button { + -gtk-icon-style: symbolic; +} + XfdesktopIconView.view { border-radius: $corner-radius; background-color: transparent; From 0e076fac7f5e8342fadd5e3afb1dc2b5412a4f7b Mon Sep 17 00:00:00 2001 From: Vince Date: Wed, 9 Nov 2022 20:41:18 +0800 Subject: [PATCH 2/5] Fixed #88 --- src/sass/gtk/_common-3.0.scss | 6 +++++- src/sass/gtk/_common-4.0.scss | 17 ++++++++++++++--- src/sass/gtk/apps/_gnome-4.0.scss | 17 ++++------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index e50143a1..d4acbd59 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1311,6 +1311,11 @@ searchbar > revealer > box { padding: $space-size $space-size * 2; border-radius: $window-radius $window-radius 0 0; box-shadow: inset 0 1px highlight($titlebar); + background-color: $titlebar; + + &:backdrop { + background-color: $titlebar-backdrop; + } .tiled &, .maximized &, @@ -3648,7 +3653,6 @@ colorchooser .popover.osd { decoration { transition: $transition-shadow; border-radius: $window-radius; - // background-color: $background; @if $rimless == 'true' { box-shadow: $shadow-z16, 0 0 36px transparent; diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 7c66d0a3..c888f498 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -1625,7 +1625,7 @@ headerbar { } } - popover.background { // reset popover + popover.background { // reset popovers button:not(.suggested-action):not(.destructive-action):not(.flat) { @extend %button-basic; } @@ -1639,6 +1639,16 @@ headerbar { } entry { @extend %entry-basic; } + + entry, + spinbutton, + button, + menubutton, + stackswitcher, + separator:not(.sidebar) { + margin-top: 0; + margin-bottom: 0; + } } separator:not(.sidebar) { @@ -2490,8 +2500,8 @@ tabbar { } > separator { - margin-top: 9px; - margin-bottom: 9px; + margin: 9px 0; + min-width: 1px; transition: opacity 150ms ease-in-out; &.hidden { @@ -2501,6 +2511,7 @@ tabbar { > tabboxchild { margin: 0 -3px; + padding: 0; > tab { @extend %tabs_tab; diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss index 1322ef43..fbf212ae 100644 --- a/src/sass/gtk/apps/_gnome-4.0.scss +++ b/src/sass/gtk/apps/_gnome-4.0.scss @@ -1127,11 +1127,10 @@ window > contents > leaflet { // Gnome control center // Gnome Weather // -@define-color weather_temp_chart_fill_color: #{rgba(248, 228, 92, 0.5)}; -@define-color weather_temp_chart_stroke_color: #{rgba(246, 211, 45, 1.0)}; - -@define-color weather_thermometer_warm_color: #{if($variant == 'light', $yellow-dark, $yellow-light)}; -@define-color weather_thermometer_cold_color: #{if($variant == 'light', $blue-dark, $blue-light)}; +@define-color weather_temp_chart_fill_color #{rgba($warning, 0.5)}; +@define-color weather_temp_chart_stroke_color #{darken($warning, 10%)}; +@define-color weather_thermometer_warm_color #{if($variant == 'light', $yellow-dark, $yellow-light)}; +@define-color weather_thermometer_cold_color #{if($variant == 'light', $blue-dark, $blue-light)}; $weather_thermometer_high_color: $yellow-light; $weather_thermometer_low_color: $blue-light; @@ -1484,11 +1483,3 @@ window.dialog { } } } - -window.aboutdialog { - stack scrolledwindow.frame > { - &, viewport.view { - border-radius: $window-radius - $space-size; - } - } -} From 4e824e9f5658196f44a6eb6b7036b946303c555e Mon Sep 17 00:00:00 2001 From: Vince Date: Wed, 9 Nov 2022 21:09:21 +0800 Subject: [PATCH 3/5] Fixed #87 --- src/sass/gtk/_common-4.0.scss | 5 ++--- src/sass/gtk/apps/_gnome-4.0.scss | 12 +++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index c888f498..bcd8392c 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -1644,8 +1644,7 @@ headerbar { spinbutton, button, menubutton, - stackswitcher, - separator:not(.sidebar) { + stackswitcher { margin-top: 0; margin-bottom: 0; } @@ -4938,7 +4937,7 @@ windowcontrols { background-color: $primary; } -.monospace { font-family: monospace; } +// .monospace { font-family: monospace; } /********************** diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss index fbf212ae..3010b021 100644 --- a/src/sass/gtk/apps/_gnome-4.0.scss +++ b/src/sass/gtk/apps/_gnome-4.0.scss @@ -98,12 +98,14 @@ window.dialog { // Calculator // -.history-view { background-color: $base; } +.display-container { + .history-view { background-color: $base; } -.sourceview { - padding: 0 12px 8px 0; - font-size: 1.4em; - border-top: 1px solid $border; + #displayitem { + padding: 0 12px 8px 0; + font-size: 1.4em; + border-top: 1px solid $border; + } } .math-buttons button { From e29a1a274ea7006a4ff7ed34a2e376f35049103b Mon Sep 17 00:00:00 2001 From: Vince Date: Thu, 10 Nov 2022 16:59:03 +0800 Subject: [PATCH 4/5] update --- src/sass/gtk/_common-4.0.scss | 61 +++++++++++++++---------------- src/sass/gtk/apps/_gnome-4.0.scss | 20 ++++------ 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index bcd8392c..2c41c758 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -2060,11 +2060,13 @@ popover.menu { /************ * Popovers * ************/ -popover.background { - font: initial; +popover { + &.background { + font: initial; - &, &:backdrop { - background-color: transparent; + &, &:backdrop { + background-color: transparent; + } } > arrow, @@ -2083,14 +2085,6 @@ popover.background { background-clip: border-box; box-shadow: 0 0 0 1px $window-border, $shadow-z5; } - - &:backdrop { - @if $rimless == 'true' { - box-shadow: $shadow-z3; - } @else { - box-shadow: $shadow-z3, 0 0 0 1px $window-border; - } - } } @if $rimless == 'false' and $variant == 'light' { @@ -4753,12 +4747,32 @@ colorchooser .popover.osd { **********************/ window { border: none; - transition: $transition-shadow; &.csd { border-radius: $window-radius; outline-offset: -1px; outline: 1px solid highlight($background); + margin: 0; + + @if $rimless == 'true' { + box-shadow: $shadow-z16, 0 0 36px transparent; + } @else { + box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent; + } + + &:backdrop { + // the transparent shadow here is to enforce that the shadow extents don't + // change when we go to backdrop, to prevent jumping windows. + // The biggest shadow should be in the same order then in the active state + // or the jumping will happen during the transition. + transition: $transition-shadow; + + @if $rimless == 'true' { + box-shadow: $shadow-z4, 0 0 36px transparent; + } @else { + box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent; + } + } &.maximized, &.fullscreen, @@ -4766,24 +4780,9 @@ window { &.tiled-top, &.tiled-right, &.tiled-bottom, - &.tiled-left { border-radius: 0; } - } - - @if $rimless == 'true' { - box-shadow: $shadow-z16, 0 0 36px transparent; - } @else { - box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent; - } - - &:backdrop { - // the transparent shadow here is to enforce that the shadow extents don't - // change when we go to backdrop, to prevent jumping windows. - // The biggest shadow should be in the same order then in the active state - // or the jumping will happen during the transition. - @if $rimless == 'true' { - box-shadow: $shadow-z4, 0 0 36px transparent; - } @else { - box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent; + &.tiled-left { + border-radius: 0; + transition: none; } } diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss index 3010b021..5d7ec66a 100644 --- a/src/sass/gtk/apps/_gnome-4.0.scss +++ b/src/sass/gtk/apps/_gnome-4.0.scss @@ -99,6 +99,12 @@ window.dialog { // .display-container { + &.card { + border-radius: 0; + box-shadow: none; + border-width: 0 0 1px 0; + } + .history-view { background-color: $base; } #displayitem { @@ -118,19 +124,6 @@ window.dialog { } } -.small .card { - border-radius: 0; - box-shadow: none; - - &.forecast-card { - border-width: 1px 0; - } - - &.display-container { - border-width: 0 0 1px 0; - } -} - leaflet { button.number-button { background-color: rgba($text, 0.1); @@ -1167,6 +1160,7 @@ $weather_forecast_color: #ae7b03; .forecast-card { transition: border-radius 100ms ease-out; border-radius: $corner-radius; + border-width: 1px 0; } .forecast-card separator { From 5046c77bd638437145b50c70e0f6d2571f50b72b Mon Sep 17 00:00:00 2001 From: Vince Date: Fri, 11 Nov 2022 10:10:40 +0800 Subject: [PATCH 5/5] update --- src/sass/gtk/_common-3.0.scss | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index d4acbd59..d61becc6 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1052,6 +1052,11 @@ toolbar { border-width: 0 1px 1px; border-color: $divider; background-color: $base-alt; + + .frame & { + border-width: 1px 0 0; + background-color: transparent; + } } searchbar > revealer > box, @@ -1905,16 +1910,22 @@ notebook { border-radius: $modal-radius + $space-size; } - &.frame frame { - > border { + &.frame { + scrolledwindow.frame { border: none; - border-radius: $modal-radius; } - > list { - // @extend %circular_list; + frame { + > border { + border: none; + border-radius: $modal-radius; + } - row.activatable { border-radius: $corner-radius; } + > list { + // @extend %circular_list; + + row.activatable { border-radius: $corner-radius; } + } } } @@ -2407,7 +2418,7 @@ treeview.view { padding: 0; margin: 0; - &:not(:hover):not(:disabled):not(:checked):not(:indeterminate) { + &:not(:disabled):not(:checked):not(:indeterminate) { background-color: $divider; } @@ -2416,7 +2427,7 @@ treeview.view { } } - &:selected, &:selected:focus { + &, &:hover, &:selected { radio, check { &:checked, &:indeterminate { background-color: $assets-color;