From ac7788e00a956495e597a135b89ad65f802577d9 Mon Sep 17 00:00:00 2001 From: Vince Date: Tue, 2 Nov 2021 10:28:09 +0800 Subject: [PATCH] Fixed #140 --- src/_sass/gtk/_common-3.20.scss | 6 ++++-- src/_sass/gtk/apps/_misc.scss | 13 +++++++++++++ src/gtk/3.0/gtk-compact.css | 19 ++++++++++++++++--- src/gtk/3.0/gtk-dark-compact.css | 19 ++++++++++++++++--- src/gtk/3.0/gtk-dark.css | 19 ++++++++++++++++--- src/gtk/3.0/gtk-light-compact.css | 19 ++++++++++++++++--- src/gtk/3.0/gtk-light.css | 19 ++++++++++++++++--- src/gtk/3.0/gtk.css | 19 ++++++++++++++++--- 8 files changed, 113 insertions(+), 20 deletions(-) diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss index 1edf498..6949fa5 100644 --- a/src/_sass/gtk/_common-3.20.scss +++ b/src/_sass/gtk/_common-3.20.scss @@ -140,7 +140,7 @@ // &:hover, &:selected { border-radius: $corner-radius; } &:selected { - @extend %selected_items_primary; + @extend %selected_items; &:hover { box-shadow: none; } } @@ -1791,10 +1791,12 @@ popover.background { } notebook { + background-color: $base; + frame > paned > & > header, &.frame > header { background-color: $base-alt; } - &, &.frame { + .background.csd &, &.frame { background-color: $base; border-radius: $corner-radius; } diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss index 9cde3ab..ae311be 100644 --- a/src/_sass/gtk/apps/_misc.scss +++ b/src/_sass/gtk/apps/_misc.scss @@ -343,3 +343,16 @@ window.background.csd { // // LibreOffice // + +#combobox { + background-color: $base; +} + +#gtk-combobox-popup-menu { + .view { + &:selected, &:hover { + background-image: image($primary); + color: on($primary); + } + } +} diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css index 6dd23ca..5abebdb 100644 --- a/src/gtk/3.0/gtk-compact.css +++ b/src/gtk/3.0/gtk-compact.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: rgba(0, 0, 0, 0.87); background-color: rgba(235, 235, 235, 0.987); } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #1A73E8; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #FFFFFF; } +notebook { + background-color: #FFFFFF; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #FAFAFA; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #FFFFFF; border-radius: 12px; } @@ -7377,6 +7381,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(0, 0, 0, 0.12); } +#combobox { + background-color: #FFFFFF; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#1A73E8); + color: white; +} + /********* * Unity * *********/ diff --git a/src/gtk/3.0/gtk-dark-compact.css b/src/gtk/3.0/gtk-dark-compact.css index 832bd5a..f512331 100644 --- a/src/gtk/3.0/gtk-dark-compact.css +++ b/src/gtk/3.0/gtk-dark-compact.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: white; background-color: #414141; } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #3281ea; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #2C2C2C; } +notebook { + background-color: #2C2C2C; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #242424; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #2C2C2C; border-radius: 12px; } @@ -7377,6 +7381,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(255, 255, 255, 0.12); } +#combobox { + background-color: #2C2C2C; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#3281ea); + color: white; +} + /********* * Unity * *********/ diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css index 0002412..3bf8bc3 100644 --- a/src/gtk/3.0/gtk-dark.css +++ b/src/gtk/3.0/gtk-dark.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: white; background-color: #414141; } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #3281ea; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #2C2C2C; } +notebook { + background-color: #2C2C2C; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #242424; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #2C2C2C; border-radius: 12px; } @@ -7377,6 +7381,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(255, 255, 255, 0.12); } +#combobox { + background-color: #2C2C2C; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#3281ea); + color: white; +} + /********* * Unity * *********/ diff --git a/src/gtk/3.0/gtk-light-compact.css b/src/gtk/3.0/gtk-light-compact.css index fd5e7c0..4f5d98e 100644 --- a/src/gtk/3.0/gtk-light-compact.css +++ b/src/gtk/3.0/gtk-light-compact.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: rgba(0, 0, 0, 0.87); background-color: rgba(235, 235, 235, 0.987); } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #1A73E8; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #FFFFFF; } +notebook { + background-color: #FFFFFF; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #FAFAFA; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #FFFFFF; border-radius: 12px; } @@ -7376,6 +7380,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(0, 0, 0, 0.12); } +#combobox { + background-color: #FFFFFF; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#1A73E8); + color: white; +} + /********* * Unity * *********/ diff --git a/src/gtk/3.0/gtk-light.css b/src/gtk/3.0/gtk-light.css index 56dd7ab..a95981f 100644 --- a/src/gtk/3.0/gtk-light.css +++ b/src/gtk/3.0/gtk-light.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: rgba(0, 0, 0, 0.87); background-color: rgba(235, 235, 235, 0.987); } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #1A73E8; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #FFFFFF; } +notebook { + background-color: #FFFFFF; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #FAFAFA; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #FFFFFF; border-radius: 12px; } @@ -7376,6 +7380,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(0, 0, 0, 0.12); } +#combobox { + background-color: #FFFFFF; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#1A73E8); + color: white; +} + /********* * Unity * *********/ diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index 19c042d..a4583b6 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -42,7 +42,7 @@ } XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover.budgie-menu button.flat:not(.image-button):not(.indicator-item):checked, box.vertical > widget > widget:selected, calendar:selected, row:selected, treeview.view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected, modelbutton.flat:selected, -.menuitem.button.flat:selected { +.menuitem.button.flat:selected, .view:selected, filechooser stack.view scrolledwindow treeview.view:selected { color: rgba(0, 0, 0, 0.87); background-color: rgba(235, 235, 235, 0.987); } @@ -53,7 +53,7 @@ XfdesktopIconView.view:active, calendar.raven-calendar:selected, .budgie-popover } .nemo-window .nemo-window-pane widget.entry:selected, window.background.csd evview.view.content-view:selected, window.background.csd evview.view.content-view:selected:backdrop, spinbutton.vertical selection, spinbutton:not(.vertical) selection, -entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected, .view:selected, window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), filechooser stack.view scrolledwindow treeview.view:selected { +entry selection, label selection, textview text selection:focus, textview text selection, widget.view:selected { color: white; background-color: #1A73E8; } @@ -3236,11 +3236,15 @@ tabbox > tab:checked.reorderable-page, notebook > header tab:checked.reorderable background-color: #FFFFFF; } +notebook { + background-color: #FFFFFF; +} + frame > paned > notebook > header, notebook.frame > header { background-color: #FAFAFA; } -notebook, notebook.frame { +.background.csd notebook, notebook.frame { background-color: #FFFFFF; border-radius: 12px; } @@ -7377,6 +7381,15 @@ window.background.csd > box.vertical > overlay > stack > scrolledwindow.frame > border-top: 1px solid rgba(0, 0, 0, 0.12); } +#combobox { + background-color: #FFFFFF; +} + +#gtk-combobox-popup-menu .view:selected, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:selected:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:selected:not(.progressbar):not(.trough), #gtk-combobox-popup-menu .view:hover, #gtk-combobox-popup-menu window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow treeview.view:hover:not(.progressbar):not(.trough), window#gnome-system-monitor.background.csd > box.vertical > stack > box.vertical > scrolledwindow #gtk-combobox-popup-menu treeview.view:hover:not(.progressbar):not(.trough) { + background-image: image(#1A73E8); + color: white; +} + /********* * Unity * *********/