[gtk: 3/3] Merge branch 'activatable-colorswatch-style' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0c0ced137472b37dfa5c7a31331a91b52b6f379c
Merge: bfd8c5383f b694771728
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 8 03:09:30 2020 +0000

    Merge branch 'activatable-colorswatch-style' into 'master'
    
    Adwaita: Limit color swatch's hover effect to .activatable
    
    See merge request GNOME/gtk!2411

 gtk/gtkcolorbutton.c           |  1 +
 gtk/theme/Adwaita/_common.scss | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)
---