From 2a34b06246d427ec69069440cd1dcc0ea876e94c Mon Sep 17 00:00:00 2001 From: Vince Date: Sun, 8 Nov 2020 12:40:01 +0800 Subject: [PATCH] Fixed gnome-clocks 3.38 issues --- src/main/gtk-3.0/gtk-dark-solid.css | 15 +++++++++++++-- src/main/gtk-3.0/gtk-dark.css | 15 +++++++++++++-- src/main/gtk-3.0/gtk-light-solid.css | 15 +++++++++++++-- src/main/gtk-3.0/gtk-light.css | 15 +++++++++++++-- src/sass/gtk/_applications.scss | 21 ++++++++++++++++++++- 5 files changed, 72 insertions(+), 9 deletions(-) diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index ebe44c0..14f2d98 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -6152,7 +6152,18 @@ window.background.csd > box.vertical > overlay > stack.background { border-bottom-left-radius: 14px; } -hdyviewswitcherbar > actionbar { +window.background.csd.unified { + border-top-left-radius: 14px; + border-top-right-radius: 14px; +} + +window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio { + margin: 0; + border-radius: 0; +} + +hdyviewswitcherbar > actionbar, +viewswitcherbar > actionbar { background: none; border: none; } @@ -7235,7 +7246,7 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g background: none; } -.geary-accounts-editor-pane .geary-accounts-editor-pane-content .geary-labelled-row.geary-settings entry { +.geary-settings entry { background-color: rgba(255, 255, 255, 0.05) !important; } diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 6ce0134..6beec6a 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -6148,7 +6148,18 @@ window.background.csd > box.vertical > overlay > stack.background { border-bottom-left-radius: 14px; } -hdyviewswitcherbar > actionbar { +window.background.csd.unified { + border-top-left-radius: 14px; + border-top-right-radius: 14px; +} + +window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio { + margin: 0; + border-radius: 0; +} + +hdyviewswitcherbar > actionbar, +viewswitcherbar > actionbar { background: none; border: none; } @@ -7231,7 +7242,7 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g background: none; } -.geary-accounts-editor-pane .geary-accounts-editor-pane-content .geary-labelled-row.geary-settings entry { +.geary-settings entry { background-color: rgba(255, 255, 255, 0.05) !important; } diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index d1c497c..a0f6955 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -6174,7 +6174,18 @@ window.background.csd > box.vertical > overlay > stack.background { border-bottom-left-radius: 14px; } -hdyviewswitcherbar > actionbar { +window.background.csd.unified { + border-top-left-radius: 14px; + border-top-right-radius: 14px; +} + +window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio { + margin: 0; + border-radius: 0; +} + +hdyviewswitcherbar > actionbar, +viewswitcherbar > actionbar { background: none; border: none; } @@ -7250,7 +7261,7 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g background: none; } -.geary-accounts-editor-pane .geary-accounts-editor-pane-content .geary-labelled-row.geary-settings entry { +.geary-settings entry { background-color: rgba(0, 0, 0, 0.05) !important; } diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index a4c9785..d0d7d55 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -6170,7 +6170,18 @@ window.background.csd > box.vertical > overlay > stack.background { border-bottom-left-radius: 14px; } -hdyviewswitcherbar > actionbar { +window.background.csd.unified { + border-top-left-radius: 14px; + border-top-right-radius: 14px; +} + +window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.titlebar.windowhandle > viewswitchertitle > squeezer > viewswitcher > box.horizontal > button.radio { + margin: 0; + border-radius: 0; +} + +hdyviewswitcherbar > actionbar, +viewswitcherbar > actionbar { background: none; border: none; } @@ -7246,7 +7257,7 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g background: none; } -.geary-accounts-editor-pane .geary-accounts-editor-pane-content .geary-labelled-row.geary-settings entry { +.geary-settings entry { background-color: rgba(0, 0, 0, 0.05) !important; } diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index 454c3be..f9c7868 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -1700,7 +1700,26 @@ window.background.csd { // // Gnome Clocks // -hdyviewswitcherbar > actionbar { +window.background.csd.unified { + border-top-left-radius: $wm_radius; + border-top-right-radius: $wm_radius; + + > deck > deck > deck { + > box.vertical > headerbar.titlebar.windowhandle { + > viewswitchertitle > squeezer { + > viewswitcher > box.horizontal { + > button.radio { + margin: 0; + border-radius: 0; + } + } + } + } + } +} + +hdyviewswitcherbar > actionbar, +viewswitcherbar > actionbar { // Gnome 3.38 background: none; border: none; }