From 0144cb92edcac4aaaf4abee8c9ed30da0b66536f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 28 Aug 2014 20:33:37 +0200 Subject: [PATCH] Adwaita: dim menu checks/radios a bit --- gtk/resources/theme/Adwaita/_common.scss | 3 +++ gtk/resources/theme/Adwaita/gtk-contained-dark.css | 10 ++++++++++ gtk/resources/theme/Adwaita/gtk-contained.css | 10 ++++++++++ 3 files changed, 23 insertions(+) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 8b937c0eb8..19bb1ce1da 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1747,6 +1747,7 @@ $asset_suffix: if($variant=='dark', '-dark', ''); //menu .menu .menuitem.#{$w} { -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic'); + color: mix($fg_color, $bg_color, 60%); icon-shadow: none; &:active, &:checked { -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); @@ -1754,6 +1755,8 @@ $asset_suffix: if($variant=='dark', '-dark', ''); &:inconsistent { -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic'); } + &:hover { color: $selected_fg_color; } + &:insensitive { color: mix($insensitive_fg_color, $bg_color, 50%); } } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 78415f6cd7..bb881e6554 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1911,11 +1911,16 @@ GtkSwitch { .menu .menuitem.check { -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); + color: #a5a8a6; icon-shadow: none; } .menu .menuitem.check:active, .menu .menuitem.check:checked { -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } .menu .menuitem.check:inconsistent { -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } + .menu .menuitem.check:hover { + color: #ffffff; } + .menu .menuitem.check:insensitive { + color: #666a6a; } .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); @@ -2027,11 +2032,16 @@ GtkSwitch { .menu .menuitem.radio { -gtk-icon-source: -gtk-icontheme("radio-symbolic"); + color: #a5a8a6; icon-shadow: none; } .menu .menuitem.radio:active, .menu .menuitem.radio:checked { -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } .menu .menuitem.radio:inconsistent { -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } + .menu .menuitem.radio:hover { + color: #ffffff; } + .menu .menuitem.radio:insensitive { + color: #666a6a; } GtkTreeView.view.check, GtkTreeView.view.radio { icon-shadow: none; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index bde0cb4180..83de1f3090 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1906,11 +1906,16 @@ GtkSwitch { .menu .menuitem.check { -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); + color: #7a7e7f; icon-shadow: none; } .menu .menuitem.check:active, .menu .menuitem.check:checked { -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } .menu .menuitem.check:inconsistent { -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } + .menu .menuitem.check:hover { + color: #ffffff; } + .menu .menuitem.check:insensitive { + color: #bdbebf; } .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); @@ -2022,11 +2027,16 @@ GtkSwitch { .menu .menuitem.radio { -gtk-icon-source: -gtk-icontheme("radio-symbolic"); + color: #7a7e7f; icon-shadow: none; } .menu .menuitem.radio:active, .menu .menuitem.radio:checked { -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } .menu .menuitem.radio:inconsistent { -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } + .menu .menuitem.radio:hover { + color: #ffffff; } + .menu .menuitem.radio:insensitive { + color: #bdbebf; } GtkTreeView.view.check, GtkTreeView.view.radio { icon-shadow: none; }