Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: sidebar color for file picker

Browse Source 
- avoid using the selected blue for the sidebar

Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/1586
This commit is contained in:
Jakub Steiner
2020-07-13 16:01:01 +02:00
parent 53831e67a7
commit fe5c0e2fe3
2 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
build-aux/flatpak/org.gtk.WidgetFactory4.json
View File

@@ -1,29 +1,38 @@
{ {
"app-id": "org.gtk.WidgetFactory4", "app-id" : "org.gtk.WidgetFactory4",
"runtime": "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version": "master", "runtime-version" : "master",
"sdk": "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"command": "gtk4-widget-factory", "command" : "gtk4-widget-factory",
"tags": ["devel", "development", "nightly"], "tags" : [
"desktop-file-name-prefix": "(Development) ", "devel",
"finish-args": [ "development",
"nightly"
],
"desktop-file-name-prefix" : "(Development) ",
"finish-args" : [
"--device=dri", "--device=dri",
"--share=ipc", "--share=ipc",
"--socket=fallback-x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" "--talk-name=org.gtk.vfs",
"--talk-name=org.gtk.vfs.*"
], ],
"cleanup": [ "cleanup" : [
"/include", "/include",
"/lib/pkgconfig", "/share/pkgconfig", "/lib/pkgconfig",
"/share/pkgconfig",
"/share/aclocal", "/share/aclocal",
"/man", "/share/man", "/share/gtk-doc", "/man",
"*.la", ".a", "/share/man",
"/share/gtk-doc",
"*.la",
".a",
"/lib/girepository-1.0", "/lib/girepository-1.0",
"/share/gir-1.0", "/share/gir-1.0",
"/share/doc" "/share/doc"
], ],
"modules": [ "modules" : [
{ {
"name" : "wayland", "name" : "wayland",
"buildsystem" : "autotools", "buildsystem" : "autotools",
@@ -39,18 +48,18 @@
] ]
}, },
{ {
"name": "graphene", "name" : "graphene",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Dtests=false", "-Dtests=false",
"-Dbenchmarks=false" "-Dbenchmarks=false"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://github.com/ebassi/graphene.git" "url" : "https://github.com/ebassi/graphene.git"
} }
] ]
}, },
@@ -58,7 +67,7 @@
"name" : "libsass", "name" : "libsass",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -73,7 +82,7 @@
"name" : "sassc", "name" : "sassc",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -85,18 +94,23 @@
] ]
}, },
{ {
"name": "gtk", "name" : "gtk",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://gitlab.gnome.org/GNOME/gtk.git" "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
} }
] ]
} }
] ],
"build-options" : {
"env" : {
"DBUS_SESSION_BUS_ADDRESS" : "''"
}
}
} }

13
gtk/theme/Adwaita/_common.scss
View File

@@ -3343,7 +3343,17 @@ placessidebar {
// will make the animation of the new bookmark row jump // will make the animation of the new bookmark row jump
> revealer { padding: 0 14px; } > revealer { padding: 0 14px; }
&:selected { color: $selected_fg_color; } &:selected {
background-color: $menu_selected_color;
color: $fg_color;
&:focus, &:hover {
color: $selected_fg_color;
background-color: $selected_bg_color;
}
}
&:disabled { color: $insensitive_fg_color; } &:disabled { color: $insensitive_fg_color; }
@@ -3361,7 +3371,6 @@ placessidebar {
@extend %button_basic_flat; @extend %button_basic_flat;
@extend %button_selected_flat; @extend %button_selected_flat;
min-height: 26px; min-height: 26px;
min-width: 26px; min-width: 26px;
margin-top: 3px; margin-top: 3px;