From 0e24d6cd85bd8a0ecab67bec1c611b774948e9e5 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 18 Dec 2015 14:20:39 -0800 Subject: [PATCH] theme: fix menu check/radio styling This is a leftover from the CssNode port of GtkCheckMenuItem and GtkRadioMenuItem. --- gtk/theme/Adwaita/_common.scss | 16 ++++++--- gtk/theme/Adwaita/gtk-contained-dark.css | 42 +++++++++++++++--------- gtk/theme/Adwaita/gtk-contained.css | 42 +++++++++++++++--------- 3 files changed, 63 insertions(+), 37 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index db608cd3ff..54b94f343c 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2092,15 +2092,21 @@ switch { } //menu - menu menuitem.#{$w} { + menu menuitem #{$w} { + color: mix($fg_color, $bg_color, 70%); -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic'); - color: mix($fg_color, $bg_color, 60%); -gtk-icon-shadow: none; - &:active, &:checked { - -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); + &:hover, &:insensitive { + -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic'); + -gtk-icon-shadow: none; } - &:inconsistent { + &:checked, &:checked:hover, &:checked:insensitive { + -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); + -gtk-icon-shadow: none; + } + &:inconsistent, &:inconsistent:hover, &:inconsistent:insensitive { -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic'); + -gtk-icon-shadow: none; } &:hover { color: $selected_fg_color; } &:insensitive { color: mix($insensitive_fg_color, $bg_color, 50%); } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 9d8ecadda1..887d293a5f 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2767,17 +2767,22 @@ check:backdrop:checked:insensitive { .titlebar check:backdrop:checked:insensitive button.titlebutton { -gtk-icon-shadow: none; } -menu menuitem.check { +menu menuitem check { + color: #b8bab8; -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); - color: #a6a8a7; -gtk-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 { + menu menuitem check:hover, menu menuitem check:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:inconsistent, menu menuitem check:inconsistent:hover, menu menuitem check:inconsistent:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:hover { color: #ffffff; } - menu menuitem.check:insensitive { + menu menuitem check:insensitive { color: #676b6b; } radio { @@ -2924,17 +2929,22 @@ radio:backdrop:checked:insensitive { .titlebar radio:backdrop:checked:insensitive button.titlebutton { -gtk-icon-shadow: none; } -menu menuitem.radio { +menu menuitem radio { + color: #b8bab8; -gtk-icon-source: -gtk-icontheme("radio-symbolic"); - color: #a6a8a7; -gtk-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 { + menu menuitem radio:hover, menu menuitem radio:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:inconsistent, menu menuitem radio:inconsistent:hover, menu menuitem radio:inconsistent:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:hover { color: #ffffff; } - menu menuitem.radio:insensitive { + menu menuitem radio:insensitive { color: #676b6b; } .view.check, .view.radio, diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index ecfed3ecb6..6bbefba644 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2857,17 +2857,22 @@ check:backdrop:checked:insensitive { row:selected check:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); } -menu menuitem.check { +menu menuitem check { + color: #666a6b; -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); - color: #787c7d; -gtk-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 { + menu menuitem check:hover, menu menuitem check:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:inconsistent, menu menuitem check:inconsistent:hover, menu menuitem check:inconsistent:insensitive { + -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem check:hover { color: #ffffff; } - menu menuitem.check:insensitive { + menu menuitem check:insensitive { color: #babbbb; } radio { @@ -3086,17 +3091,22 @@ radio:backdrop:checked:insensitive { row:selected radio:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); } -menu menuitem.radio { +menu menuitem radio { + color: #666a6b; -gtk-icon-source: -gtk-icontheme("radio-symbolic"); - color: #787c7d; -gtk-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 { + menu menuitem radio:hover, menu menuitem radio:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:inconsistent, menu menuitem radio:inconsistent:hover, menu menuitem radio:inconsistent:insensitive { + -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); + -gtk-icon-shadow: none; } + menu menuitem radio:hover { color: #ffffff; } - menu menuitem.radio:insensitive { + menu menuitem radio:insensitive { color: #babbbb; } .view.check, .view.radio,