From a595dccf0eb731d8f36a72c54c4ec2611f4b51f9 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 18 Jun 2014 19:29:33 +0200 Subject: [PATCH] Adwaita: remove wildcard for image effect -gtk-image-effect: hilight now is set for .button:hover --- gtk/resources/theme/Adwaita/_common.scss | 5 +---- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 ++---- gtk/resources/theme/Adwaita/gtk-contained.css | 6 ++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 3fc226bb52..9c0d19e354 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -82,10 +82,6 @@ -gtk-image-effect: dim; } -*:hover { - -gtk-image-effect: highlight; -} - .gtkstyle-fallback { background-color: $bg_color; color: $fg_color; @@ -201,6 +197,7 @@ @include button(normal); &:hover { @include button(hover); + -gtk-image-effect: hilight; } &:active { @include button(active); diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 29ff115032..2bd14bd1fc 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -82,9 +82,6 @@ *:insensitive { -gtk-image-effect: dim; } -*:hover { - -gtk-image-effect: highlight; } - .gtkstyle-fallback { background-color: #393f3f; color: #eeeeec; } @@ -219,7 +216,8 @@ background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f); text-shadow: 0 -1px rgba(0, 0, 0, 0.77976); icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); + -gtk-image-effect: hilight; } .button:active { border-width: 1px; border-style: solid; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 8a73f3a2be..f7f0d95efe 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -82,9 +82,6 @@ *:insensitive { -gtk-image-effect: dim; } -*:hover { - -gtk-image-effect: highlight; } - .gtkstyle-fallback { background-color: #ededed; color: #2e3436; } @@ -219,7 +216,8 @@ background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white, 0 1px white; } + box-shadow: inset 0 1px white, 0 1px white; + -gtk-image-effect: hilight; } .button:active { border-width: 1px; border-style: solid;