From b33bc6428c11e6fb795a26c166c44b34e1a93615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Sat, 15 Apr 2023 21:56:26 +0100 Subject: style: Drop view item color overrides We've added them because the colors assigned by the default stylesheet were not adequate as per design review: d7b03656210d5feb300d5df74db9cd4601306991 Libadwaita 1.3 updated the stylesheet to use the design-choosen colors by default in views. [0] So, we should drop our overrides which are now unnecessary and even harmful (they may be out of sync). Also, require the stable release of the dependency, because 1.3.alpha didn't include [0]. [0] https://gitlab.gnome.org/GNOME/libadwaita/-/commit/fd83834f837baeb2650c75630de10ea5cdf032f2 --- meson.build | 2 +- src/resources/style.css | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/meson.build b/meson.build index 91def4efd..e61d3ed94 100644 --- a/meson.build +++ b/meson.build @@ -105,7 +105,7 @@ gmodule = dependency('gmodule-no-export-2.0', version: glib_ver) gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.4') gnome_desktop = dependency('gnome-desktop-4', version: '>= 43') gtk = dependency('gtk4', version: '>= 4.9.1') -libadwaita = dependency('libadwaita-1', version: '>= 1.3.alpha') +libadwaita = dependency('libadwaita-1', version: '>= 1.3.0') libportal = dependency('libportal', version: '>= 0.5') libportal_gtk4 = dependency('libportal-gtk4', version: '>= 0.5') selinux = [] diff --git a/src/resources/style.css b/src/resources/style.css index bae3aa973..d86e03988 100644 --- a/src/resources/style.css +++ b/src/resources/style.css @@ -229,31 +229,6 @@ box-shadow: none; } -.nautilus-list-view columnview > listview > row.activatable:hover, -.nautilus-grid-view gridview > child.activatable:hover { - background-color: alpha(currentColor, .04); -} - -.nautilus-list-view columnview > listview > row.activatable:active, -.nautilus-grid-view gridview > child.activatable:active { - background-color: alpha(currentColor, .08); -} - -.nautilus-list-view columnview > listview > row:selected, -.nautilus-grid-view gridview > child:selected { - background-color: alpha(@accent_bg_color, .15); -} - -.nautilus-list-view columnview > listview > row.activatable:selected:hover, -.nautilus-grid-view gridview > child.activatable:selected:hover { - background-color: alpha(@accent_bg_color, .20); -} - -.nautilus-list-view columnview > listview > row.activatable:selected:active, -.nautilus-grid-view gridview > child.activatable:selected:active { - background-color: alpha(@accent_bg_color, .25); -} - .view .thumbnail { background: url('/org/gnome/nautilus/Checkerboard.png') repeat; border-radius: 2px; -- cgit v1.2.1