[gtk/wip/fmuellner/circular-osd-buttons] Adwaita: Leave .circular .osd buttons alone!

[Florian Müllner <fmuellner src gnome org>]

commit dc6ba8d6883c2038d624cd35f28ce78a3c9117d3
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Feb 18 20:34:01 2020 +0100

    Adwaita: Leave .circular .osd buttons alone!
    
    .osd suggests a particular color/background/hover style, while .circular
    only suggests roundness. So for buttons that use both classes, make sure
    the former takes precedence with regard to background/hover.

 gtk/theme/Adwaita/_common.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e6d0f5a407..03a94d2c63 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -920,14 +920,14 @@ button {
 
     $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
 
-    &:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) {
+    &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
       @include button(normal);
 
       background-image: $button_fill, $_border_bg;
       border-color: transparent;
     }
 
-    &:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
+    &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
       @include button(hover);
 
       background-image: $button_fill, $_border_bg;