From 64705797d9692d0cb6e2ecb84fe7a1a949c592ea Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 14 Aug 2015 00:26:50 +0200 Subject: [PATCH] tweak checked popover menuitems --- common/gtk-3.0/3.14/gtk-contained-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 4 +++- common/gtk-3.0/3.14/gtk-contained-solid.css | 4 +++- common/gtk-3.0/3.14/gtk-contained.css | 4 +++- common/gtk-3.0/3.14/sass/_common.scss | 3 ++- common/gtk-3.0/3.16/gtk-contained-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid-darker.css | 4 +++- common/gtk-3.0/3.16/gtk-contained-solid.css | 4 +++- common/gtk-3.0/3.16/gtk-contained.css | 4 +++- common/gtk-3.0/3.16/sass/_common.scss | 3 ++- 14 files changed, 40 insertions(+), 14 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 1855f44..eb0bf39 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index aea037c..6527a56 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2510,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index ee7935c..178b3af 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 9635c04..5ce2657 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2510,7 +2512,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 3d506be..a804228 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index c01f5d5..89e41ca 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -672,6 +672,8 @@ GtkFlowBox .grid-child { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2509,7 +2511,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, -GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +GtkLabel:selected:hover, GtkFlowBox .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 49eb41f..d9e56c9 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -736,9 +736,10 @@ $_dot_color: $selected_bg_color; border-radius: 2px; &:hover { background-color: mix($fg_color,$bg_color,5%); } - &:selected, &:checked, &:active { + &:active, &:selected { @extend %selected_items; } + &:checked { color: $fg_color; } } /********* diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 9c16d81..4819a39 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 2056939..84a241a 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2434,7 +2436,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 7629519..7a4ae0c 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #4b4f59; } + .menuitem.button.flat:checked { + color: #D3DAE3; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index a77297f..f0578bb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2434,7 +2436,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index b62274a..75064e1 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 750924f..4cea811 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -672,6 +672,8 @@ GtkTextView { border-radius: 2px; } .menuitem.button.flat:hover { background-color: #edeff0; } + .menuitem.button.flat:checked { + color: #5c616c; } /********* * Links * @@ -2433,7 +2435,7 @@ GtkVolumeButton.button { .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, -.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, +.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus { background-image: none; background-color: #5294E2; diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 9c0150f..68d56d8 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -736,9 +736,10 @@ $_dot_color: $selected_bg_color; border-radius: 2px; &:hover { background-color: mix($fg_color,$bg_color,5%); } - &:selected, &:checked, &:active { + &:active, &:selected { @extend %selected_items; } + &:checked { color: $fg_color; } } /*********