From 5f5a02f3e522a082c77a0901f05d6cc76ada05fb Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 6 May 2016 18:50:37 +0200 Subject: [PATCH] Adwaita: relocate a selector relocate treview acceleditor > label in the treeview section and add a comment for a testcase. --- gtk/theme/Adwaita/_common.scss | 6 ++---- gtk/theme/Adwaita/gtk-contained-dark.css | 5 ++--- gtk/theme/Adwaita/gtk-contained.css | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 83b2cb9041..3fd21eef68 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -420,10 +420,6 @@ entry { } } -treeview acceleditor > label { - background-color: $selected_bg_color; -} - treeview entry { &:focus { &:dir(rtl), &:dir(ltr) { // specificity bump hack @@ -1814,6 +1810,8 @@ treeview.view { transition: none; } } + + acceleditor > label { background-color: $selected_bg_color; } // see tests/testaccel to test } %column_header_button { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 76d629b786..05909fdc27 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -400,9 +400,6 @@ entry:drop(active):not(:only-child) + button, entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; } -treeview acceleditor > label { - background-color: #215d9c; } - treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #232729; transition-property: color, background; } @@ -2220,6 +2217,8 @@ treeview.view { box-shadow: inset 0 0 0 1px #232729; text-shadow: none; transition: none; } + treeview.view acceleditor > label { + background-color: #215d9c; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 9454ae9453..23e645d473 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -400,9 +400,6 @@ entry:drop(active):not(:only-child) + button, entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; } -treeview acceleditor > label { - background-color: #4a90d9; } - treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #ffffff; transition-property: color, background; } @@ -2233,6 +2230,8 @@ treeview.view { box-shadow: inset 0 0 0 1px #ffffff; text-shadow: none; transition: none; } + treeview.view acceleditor > label { + background-color: #4a90d9; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px;