From 05b766f2e55590dce11e46b9c3db547288f2402a Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 24 Aug 2017 21:39:42 +0200 Subject: Gtk+-3.20 Most themes: style menuitem accelerator hover Fixes https://github.com/mate-desktop/mate-themes/issues/192 --- desktop-themes/Blue-Submarine/gtk-3.0/menu.css | 23 +++++++++++----------- desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 17 ++++++++-------- desktop-themes/Green-Submarine/gtk-3.0/menu.css | 23 +++++++++++----------- desktop-themes/Menta/gtk-3.0/gtk-widgets.css | 17 ++++++++-------- .../TraditionalGreen/gtk-3.0/gtk-widgets.css | 14 +++++++------ .../TraditionalOk/gtk-3.0/gtk-widgets.css | 14 +++++++------ 6 files changed, 58 insertions(+), 50 deletions(-) diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css index 40a69082..b82fae1a 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css @@ -135,12 +135,22 @@ menu > menuitem:disabled, text-shadow: none; } -menu > menuitem accelerator:disabled, -.menu > menuitem accelerator:disabled { +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_dark_color, 0.8); +} + +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { color: alpha (mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4), 0.8); text-shadow: none; } +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { + color: alpha (@theme_selected_fg_color, 0.8); +} + menuitem:disabled image, .menuitem:disabled image, menuitem:active:disabled image, @@ -159,15 +169,6 @@ combobox #gtk-combobox-popup-menu menuitem:hover cellview { color: shade (@theme_selected_bg_color, 1.6); } -menuitem accelerator { - color: alpha (@menu_fg_dark_color, 0.8); -} - -menuitem accelerator:hover, -menuitem accelerator:active { - color: alpha (@theme_selected_fg_color, 0.8); -} - menuitem > arrow { min-height: 16px; min-width: 16px; diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index 844e383b..efa67d6e 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -3015,18 +3015,19 @@ menu > menuitem:disabled, color: mix (@menu_fg_color, @menu_bg_color, 0.6); } -menu > menuitem accelerator:disabled, -.menu > menuitem accelerator:disabled { - color: mix (@menu_fg_color, @menu_bg_color, 0.7); +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_color, 0.4); } -menuitem accelerator { - color: alpha (@menu_fg_color, 0.4); +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { + color: mix (@menu_fg_color, @menu_bg_color, 0.7); } -menuitem accelerator:hover, -menuitem accelerator:active { - color: alpha (@theme_selected_fg_color, 0.7); +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { + color: alpha (@theme_selected_fg_color, 0.85); } menuitem > arrow { diff --git a/desktop-themes/Green-Submarine/gtk-3.0/menu.css b/desktop-themes/Green-Submarine/gtk-3.0/menu.css index 3fb5d7aa..1a319e7f 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/menu.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/menu.css @@ -135,12 +135,22 @@ menu > menuitem:disabled, text-shadow: none; } -menu > menuitem accelerator:disabled, -.menu > menuitem accelerator:disabled { +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_dark_color, 0.8); +} + +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { color: alpha (mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4), 0.8); text-shadow: none; } +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { + color: alpha (@theme_selected_fg_color, 0.8); +} + menuitem:disabled image, .menuitem:disabled image, menuitem:active:disabled image, @@ -159,15 +169,6 @@ combobox #gtk-combobox-popup-menu menuitem:hover cellview { color: shade (@theme_selected_bg_color, 1.6); } -menuitem accelerator { - color: alpha (@menu_fg_dark_color, 0.8); -} - -menuitem accelerator:hover, -menuitem accelerator:active { - color: alpha (@theme_selected_fg_color, 0.8); -} - menuitem > arrow { min-height: 16px; min-width: 16px; diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css index b1a8840c..7c27948e 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css @@ -3016,18 +3016,19 @@ menu > menuitem:disabled, color: mix (@menu_fg_color, @menu_bg_color, 0.6); } -menu > menuitem accelerator:disabled, -.menu > menuitem accelerator:disabled { - color: mix (@menu_fg_color, @menu_bg_color, 0.7); +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_color, 0.4); } -menuitem accelerator { - color: alpha (@menu_fg_color, 0.4); +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { + color: mix (@menu_fg_color, @menu_bg_color, 0.7); } -menuitem accelerator:hover, -menuitem accelerator:active { - color: alpha (@theme_selected_fg_color, 0.7); +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { + color: alpha (@theme_selected_fg_color, 0.85); } menuitem > arrow { diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css index 95d2178d..84440ec3 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css @@ -2567,16 +2567,18 @@ menuitem:active:disabled image, opacity: 0.5; } -menu menuitem accelerator:disabled, -.menu menuitem accelerator:disabled { - color: mix (@menu_fg_color, @menu_bg_color, 0.7); +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_color, 0.4); } -menuitem accelerator { - color: alpha (@menu_fg_color, 0.4); +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { + color: mix (@menu_fg_color, @menu_bg_color, 0.7); } -menuitem accelerator:hover { +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { color: alpha (@menu_fg_color, 0.3); } diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css index 65da4a0b..5b4891f9 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css @@ -2570,16 +2570,18 @@ menuitem:active:disabled image, } -menu menuitem accelerator:disabled, -.menu menuitem accelerator:disabled { - color: mix (@menu_fg_color, @menu_bg_color, 0.7); +menu > menuitem accelerator, +.menu > menuitem accelerator { + color: alpha (@menu_fg_color, 0.4); } -menuitem accelerator { - color: alpha (@menu_fg_color, 0.4); +menu > menuitem:disabled > label > accelerator, +.menu > menuitem:disabled > label > accelerator { + color: mix (@menu_fg_color, @menu_bg_color, 0.7); } -menuitem accelerator:hover { +menu > menuitem:hover > label > accelerator, +.menu > menuitem:hover > label > accelerator { color: alpha (@menu_fg_color, 0.3); } -- cgit v1.2.1