From f17c91aa2f732f9f6b14cf2fbe8aa2a173a31453 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 15 Mar 2018 23:36:10 +0800 Subject: [PATCH] fixed menu bug --- src/gtk-3.0/gtk-dark-solid.css | 4 ---- src/gtk-3.0/gtk-dark.css | 4 ---- src/gtk-3.0/gtk-light-solid.css | 4 ---- src/gtk-3.0/gtk-light.css | 4 ---- src/gtk-3.0/sass/_common.scss | 8 ++++---- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css index 9bd077e..b31c2cb 100644 --- a/src/gtk-3.0/gtk-dark-solid.css +++ b/src/gtk-3.0/gtk-dark-solid.css @@ -2325,12 +2325,10 @@ menu, padding: 6px 0; border-radius: 6px; background-color: #333333; - transition: none; } .csd menu, .csd .menu { - transition: none; border-radius: 6px; background-color: #333333; } @@ -2358,7 +2356,6 @@ menu menuitem, menu menuitem:hover, .menu menuitem:hover { - transition: none; color: #ffffff; background-color: #0046DB; text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); @@ -2450,7 +2447,6 @@ menu > arrow.bottom, menu > arrow:hover, .menu > arrow:hover { - transition: none; background-color: #373737; } diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index 694031a..bf0fe17 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -2325,12 +2325,10 @@ menu, padding: 6px 0; border-radius: 6px; background-color: rgba(51, 51, 51, 0.98); - transition: none; } .csd menu, .csd .menu { - transition: none; border-radius: 6px; background-color: rgba(51, 51, 51, 0.98); } @@ -2358,7 +2356,6 @@ menu menuitem, menu menuitem:hover, .menu menuitem:hover { - transition: none; color: #ffffff; background-color: #0046DB; text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); @@ -2450,7 +2447,6 @@ menu > arrow.bottom, menu > arrow:hover, .menu > arrow:hover { - transition: none; background-color: #373737; } diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css index 1447bde..a1855b5 100644 --- a/src/gtk-3.0/gtk-light-solid.css +++ b/src/gtk-3.0/gtk-light-solid.css @@ -2335,12 +2335,10 @@ menu, padding: 6px 0; border-radius: 6px; background-color: #ffffff; - transition: none; } .csd menu, .csd .menu { - transition: none; border-radius: 6px; background-color: #ffffff; } @@ -2368,7 +2366,6 @@ menu menuitem, menu menuitem:hover, .menu menuitem:hover { - transition: none; color: #ffffff; background-color: #0046DB; text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); @@ -2460,7 +2457,6 @@ menu > arrow.bottom, menu > arrow:hover, .menu > arrow:hover { - transition: none; background-color: #e9e9e9; } diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index b251653..593f637 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -2335,12 +2335,10 @@ menu, padding: 6px 0; border-radius: 6px; background-color: rgba(255, 255, 255, 0.95); - transition: none; } .csd menu, .csd .menu { - transition: none; border-radius: 6px; background-color: rgba(255, 255, 255, 0.95); } @@ -2368,7 +2366,6 @@ menu menuitem, menu menuitem:hover, .menu menuitem:hover { - transition: none; color: #ffffff; background-color: #0046DB; text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); @@ -2460,7 +2457,6 @@ menu > arrow.bottom, menu > arrow:hover, .menu > arrow:hover { - transition: none; background-color: #e9e9e9; } diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss index 5d43399..2d825a1 100644 --- a/src/gtk-3.0/sass/_common.scss +++ b/src/gtk-3.0/sass/_common.scss @@ -1869,11 +1869,9 @@ menu, padding: 6px 0; border-radius: $wm_radius; background-color: $_menu_bg; - transition: none; // border: 1px solid $borders_color; .csd & { - transition: none; border-radius: $wm_radius; background-color: $_menu_bg; // border: 1px solid $borders_color; @@ -1902,7 +1900,6 @@ menu, transition: none; &:hover { - transition: none; color: $selected_fg_color; background-color: $selected_bg_color; text-shadow: $text_shadow; @@ -1968,13 +1965,16 @@ menu, border-bottom: 1px solid $borders_color; -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); } + &.bottom { margin: 0 0 -18px 0; border-radius: 0 0 $wm_radius $wm_radius; border-top: 1px solid $borders_color; -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - &:hover { transition: none; background-color: mix($fg_color, $base_color, 10%); } + + &:hover { background-color: mix($fg_color, $base_color, 10%); } + &:disabled { color: transparent; background-color: transparent;