From 4d608ad7226fe0e8a7ab1366a95d616e4b464c3a Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 29 Aug 2014 19:47:38 +0200 Subject: [PATCH] Adwaita: no edge hilight for checks and radios in list-rows --- gtk/resources/theme/Adwaita/_common.scss | 17 +++++++++-------- .../theme/Adwaita/gtk-contained-dark.css | 7 +++++-- gtk/resources/theme/Adwaita/gtk-contained.css | 7 +++++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 267954032d..fb0842bb87 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1011,26 +1011,26 @@ GtkComboBox { $selected_fg_color, $noedge: true); } &.suggested-action { - @include button($t:normal, $noedge:true); + @include button(normal, $noedge:true); border-color: $selected_borders_color; &:hover { - @include button($t:hover, $noedge: true); + @include button(hover, $noedge: true); border-color: $selected_borders_color; } &:active { - @include button($t:active, $noedge: true); + @include button(active, $noedge: true); border-color: $selected_borders_color; } &:insensitive { - @include button($t:insensitive, $noedge: true); + @include button(insensitive, $noedge: true); border-color: $selected_borders_color; } &:backdrop { - @include button($t:backdrop, $noedge: true); + @include button(backdrop, $noedge: true); border-color: $selected_borders_color; } &:backdrop:insensitive { - @include button($t:backdrop-insensitive, $noedge: true); + @include button(backdrop-insensitive, $noedge: true); border-color: $selected_borders_color; } } @@ -1764,8 +1764,9 @@ $asset_suffix: if($variant=='dark', '-dark', ''); } } -//treeview -GtkTreeView.view.check, GtkTreeView.view.radio { +//treeview and list-rows +GtkTreeView.view.check, GtkTreeView.view.radio, +.list-row .check, list-row .radio { icon-shadow: none; &:selected, &:hover { icon-shadow: none; } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 9c630d1d70..7cb138ccd3 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -2291,9 +2291,12 @@ GtkSwitch { .menu .menuitem.radio:insensitive { color: #666a6a; } -GtkTreeView.view.check, GtkTreeView.view.radio { +GtkTreeView.view.check, GtkTreeView.view.radio, +.list-row .check, list-row .radio { icon-shadow: none; } - GtkTreeView.view.check:selected, GtkTreeView.view.check:hover, GtkTreeView.view.radio:selected, GtkTreeView.view.radio:hover { + GtkTreeView.view.check:selected, GtkTreeView.view.check:hover, GtkTreeView.view.radio:selected, GtkTreeView.view.radio:hover, + .list-row .check:selected, + .list-row .check:hover, list-row .radio:selected, list-row .radio:hover { icon-shadow: none; } GtkIconView.view.check, diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 927564aace..8b377db148 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -2286,9 +2286,12 @@ GtkSwitch { .menu .menuitem.radio:insensitive { color: #bdbebf; } -GtkTreeView.view.check, GtkTreeView.view.radio { +GtkTreeView.view.check, GtkTreeView.view.radio, +.list-row .check, list-row .radio { icon-shadow: none; } - GtkTreeView.view.check:selected, GtkTreeView.view.check:hover, GtkTreeView.view.radio:selected, GtkTreeView.view.radio:hover { + GtkTreeView.view.check:selected, GtkTreeView.view.check:hover, GtkTreeView.view.radio:selected, GtkTreeView.view.radio:hover, + .list-row .check:selected, + .list-row .check:hover, list-row .radio:selected, list-row .radio:hover { icon-shadow: none; } GtkIconView.view.check,