From c2062e17a9be944476e99b242f013173978aae95 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 1 Mar 2020 23:32:45 +0800 Subject: [PATCH] Fixed nemo issues --- src/_sass/gtk/apps/_budgie.scss | 2 +- src/_sass/gtk/apps/_gnome-3.22.scss | 8 ++------ src/_sass/gtk/apps/_nemo.scss | 7 ++++++- src/gtk/3.0/gtk-compact.css | 17 ++++++++--------- src/gtk/3.0/gtk-dark-compact.css | 17 ++++++++--------- src/gtk/3.0/gtk-dark.css | 17 ++++++++--------- src/gtk/3.0/gtk.css | 17 ++++++++--------- 7 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss index 90bd1f2..6d68451 100644 --- a/src/_sass/gtk/apps/_budgie.scss +++ b/src/_sass/gtk/apps/_budgie.scss @@ -273,7 +273,7 @@ (bottom, 16px 16px 0 0), (left, 0 16px 16px 0), (right, 16px 0 0 16px) { - .#{$pos} &.transparent { + .#{$pos} &.transparent, .#{$pos} &:not(.dock-mode) { border-radius: $p_radius; } } diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss index 3b95eac..ab4cfe3 100644 --- a/src/_sass/gtk/apps/_gnome-3.22.scss +++ b/src/_sass/gtk/apps/_gnome-3.22.scss @@ -757,12 +757,8 @@ stack { * Gnome Contacts * ******************/ window.background.csd { - > overlay > grid.horizontal { - > overlay > stack > box.horizontal > grid.horizontal { - > scrolledwindow.contacts-contact-form { - border-bottom-right-radius: $window-radius; - } - } + scrolledwindow.contacts-contact-form { + border-bottom-right-radius: $window-radius; } } diff --git a/src/_sass/gtk/apps/_nemo.scss b/src/_sass/gtk/apps/_nemo.scss index f4de43c..08cc75e 100644 --- a/src/_sass/gtk/apps/_nemo.scss +++ b/src/_sass/gtk/apps/_nemo.scss @@ -9,6 +9,7 @@ .nemo-window { .primary-toolbar { + background-color: $titlebar; border-bottom: 1px solid $divider; // FIXME: workaround for wrong size allocation of Nemo @@ -30,13 +31,15 @@ } } + // .nemo-places-sidebar { } + scrolledwindow.frame { border-style: none; .view:not(:selected) { background-color: transparent; } } - infobar { margin-top: -6px; } + // infobar { margin-top: -6px; } // Inactive F3 pane shading .nemo-inactive-pane .view:not(:selected) { background-color: $base-alt; } @@ -67,6 +70,8 @@ -NemoPlacesTreeView-disk-full-bar-radius: 0; -NemoPlacesTreeView-disk-full-bottom-padding: 1px; // There is already hard-coded 1px bottom-padding -NemoPlacesTreeView-disk-full-max-length: 80px; + padding-top: $container-padding/2; + padding-bottom: $container-padding/2; } .nemo-desktop.nemo-canvas-item { diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css index e5c8d96..d786be6 100644 --- a/src/gtk/3.0/gtk-compact.css +++ b/src/gtk/3.0/gtk-compact.css @@ -4719,7 +4719,7 @@ stack > grid.vertical scrolledwindow.frame.emptyGrid { /****************** * Gnome Contacts * ******************/ -window.background.csd > overlay > grid.horizontal > overlay > stack > box.horizontal > grid.horizontal > scrolledwindow.contacts-contact-form { +window.background.csd scrolledwindow.contacts-contact-form { border-bottom-right-radius: 18px; } @@ -6553,19 +6553,19 @@ MsdOsdWindow.background.osd .progressbar { background-color: rgba(0, 0, 0, 0.6); } -.top .budgie-panel.transparent { +.top .budgie-panel.transparent, .top .budgie-panel:not(.dock-mode) { border-radius: 0 0 16px 16px; } -.bottom .budgie-panel.transparent { +.bottom .budgie-panel.transparent, .bottom .budgie-panel:not(.dock-mode) { border-radius: 16px 16px 0 0; } -.left .budgie-panel.transparent { +.left .budgie-panel.transparent, .left .budgie-panel:not(.dock-mode) { border-radius: 0 16px 16px 0; } -.right .budgie-panel.transparent { +.right .budgie-panel.transparent, .right .budgie-panel:not(.dock-mode) { border-radius: 16px 0 0 16px; } @@ -7141,6 +7141,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind * Nemo * ********/ .nemo-window .primary-toolbar { + background-color: #FFFFFF; border-bottom: 1px solid rgba(0, 0, 0, 0.12); } @@ -7167,10 +7168,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind background-color: transparent; } -.nemo-window infobar { - margin-top: -6px; -} - .nemo-window .nemo-inactive-pane .view:not(:selected), .nemo-window .nemo-inactive-pane window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .nemo-window .nemo-inactive-pane treeview.view:not(:selected) { background-color: #FAFAFA; } @@ -7187,6 +7184,8 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind -NemoPlacesTreeView-disk-full-bar-radius: 0; -NemoPlacesTreeView-disk-full-bottom-padding: 1px; -NemoPlacesTreeView-disk-full-max-length: 80px; + padding-top: 2px; + padding-bottom: 2px; } /* GTK NAMED COLORS diff --git a/src/gtk/3.0/gtk-dark-compact.css b/src/gtk/3.0/gtk-dark-compact.css index 9d9efe3..0663911 100644 --- a/src/gtk/3.0/gtk-dark-compact.css +++ b/src/gtk/3.0/gtk-dark-compact.css @@ -4720,7 +4720,7 @@ stack > grid.vertical scrolledwindow.frame.emptyGrid { /****************** * Gnome Contacts * ******************/ -window.background.csd > overlay > grid.horizontal > overlay > stack > box.horizontal > grid.horizontal > scrolledwindow.contacts-contact-form { +window.background.csd scrolledwindow.contacts-contact-form { border-bottom-right-radius: 18px; } @@ -6554,19 +6554,19 @@ MsdOsdWindow.background.osd .progressbar { background-color: rgba(0, 0, 0, 0.6); } -.top .budgie-panel.transparent { +.top .budgie-panel.transparent, .top .budgie-panel:not(.dock-mode) { border-radius: 0 0 16px 16px; } -.bottom .budgie-panel.transparent { +.bottom .budgie-panel.transparent, .bottom .budgie-panel:not(.dock-mode) { border-radius: 16px 16px 0 0; } -.left .budgie-panel.transparent { +.left .budgie-panel.transparent, .left .budgie-panel:not(.dock-mode) { border-radius: 0 16px 16px 0; } -.right .budgie-panel.transparent { +.right .budgie-panel.transparent, .right .budgie-panel:not(.dock-mode) { border-radius: 16px 0 0 16px; } @@ -7142,6 +7142,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind * Nemo * ********/ .nemo-window .primary-toolbar { + background-color: #2C2C2C; border-bottom: 1px solid rgba(255, 255, 255, 0.12); } @@ -7168,10 +7169,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind background-color: transparent; } -.nemo-window infobar { - margin-top: -6px; -} - .nemo-window .nemo-inactive-pane .view:not(:selected), .nemo-window .nemo-inactive-pane window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .nemo-window .nemo-inactive-pane treeview.view:not(:selected) { background-color: #242424; } @@ -7188,6 +7185,8 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind -NemoPlacesTreeView-disk-full-bar-radius: 0; -NemoPlacesTreeView-disk-full-bottom-padding: 1px; -NemoPlacesTreeView-disk-full-max-length: 80px; + padding-top: 2px; + padding-bottom: 2px; } /* GTK NAMED COLORS diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css index d89e873..64f09af 100644 --- a/src/gtk/3.0/gtk-dark.css +++ b/src/gtk/3.0/gtk-dark.css @@ -4720,7 +4720,7 @@ stack > grid.vertical scrolledwindow.frame.emptyGrid { /****************** * Gnome Contacts * ******************/ -window.background.csd > overlay > grid.horizontal > overlay > stack > box.horizontal > grid.horizontal > scrolledwindow.contacts-contact-form { +window.background.csd scrolledwindow.contacts-contact-form { border-bottom-right-radius: 18px; } @@ -6554,19 +6554,19 @@ MsdOsdWindow.background.osd .progressbar { background-color: rgba(0, 0, 0, 0.6); } -.top .budgie-panel.transparent { +.top .budgie-panel.transparent, .top .budgie-panel:not(.dock-mode) { border-radius: 0 0 16px 16px; } -.bottom .budgie-panel.transparent { +.bottom .budgie-panel.transparent, .bottom .budgie-panel:not(.dock-mode) { border-radius: 16px 16px 0 0; } -.left .budgie-panel.transparent { +.left .budgie-panel.transparent, .left .budgie-panel:not(.dock-mode) { border-radius: 0 16px 16px 0; } -.right .budgie-panel.transparent { +.right .budgie-panel.transparent, .right .budgie-panel:not(.dock-mode) { border-radius: 16px 0 0 16px; } @@ -7142,6 +7142,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind * Nemo * ********/ .nemo-window .primary-toolbar { + background-color: #2C2C2C; border-bottom: 1px solid rgba(255, 255, 255, 0.12); } @@ -7168,10 +7169,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind background-color: transparent; } -.nemo-window infobar { - margin-top: -6px; -} - .nemo-window .nemo-inactive-pane .view:not(:selected), .nemo-window .nemo-inactive-pane window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .nemo-window .nemo-inactive-pane treeview.view:not(:selected) { background-color: #242424; } @@ -7188,6 +7185,8 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind -NemoPlacesTreeView-disk-full-bar-radius: 0; -NemoPlacesTreeView-disk-full-bottom-padding: 1px; -NemoPlacesTreeView-disk-full-max-length: 80px; + padding-top: 3px; + padding-bottom: 3px; } /* GTK NAMED COLORS diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index 5b5077e..48afee6 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -4719,7 +4719,7 @@ stack > grid.vertical scrolledwindow.frame.emptyGrid { /****************** * Gnome Contacts * ******************/ -window.background.csd > overlay > grid.horizontal > overlay > stack > box.horizontal > grid.horizontal > scrolledwindow.contacts-contact-form { +window.background.csd scrolledwindow.contacts-contact-form { border-bottom-right-radius: 18px; } @@ -6553,19 +6553,19 @@ MsdOsdWindow.background.osd .progressbar { background-color: rgba(0, 0, 0, 0.6); } -.top .budgie-panel.transparent { +.top .budgie-panel.transparent, .top .budgie-panel:not(.dock-mode) { border-radius: 0 0 16px 16px; } -.bottom .budgie-panel.transparent { +.bottom .budgie-panel.transparent, .bottom .budgie-panel:not(.dock-mode) { border-radius: 16px 16px 0 0; } -.left .budgie-panel.transparent { +.left .budgie-panel.transparent, .left .budgie-panel:not(.dock-mode) { border-radius: 0 16px 16px 0; } -.right .budgie-panel.transparent { +.right .budgie-panel.transparent, .right .budgie-panel:not(.dock-mode) { border-radius: 16px 0 0 16px; } @@ -7141,6 +7141,7 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind * Nemo * ********/ .nemo-window .primary-toolbar { + background-color: #FFFFFF; border-bottom: 1px solid rgba(0, 0, 0, 0.12); } @@ -7167,10 +7168,6 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind background-color: transparent; } -.nemo-window infobar { - margin-top: -6px; -} - .nemo-window .nemo-inactive-pane .view:not(:selected), .nemo-window .nemo-inactive-pane window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:not(:selected), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow .nemo-window .nemo-inactive-pane treeview.view:not(:selected) { background-color: #FAFAFA; } @@ -7187,6 +7184,8 @@ window.background.csd.thunar > grid.horizontal > paned.horizontal > scrolledwind -NemoPlacesTreeView-disk-full-bar-radius: 0; -NemoPlacesTreeView-disk-full-bottom-padding: 1px; -NemoPlacesTreeView-disk-full-max-length: 80px; + padding-top: 3px; + padding-bottom: 3px; } /* GTK NAMED COLORS