From 10fcd33b175bf3a5763c05252bf71c3ace84e213 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Thu, 1 Feb 2018 20:56:43 +0800
Subject: [PATCH] Fixed bugs and update

---
 src/gtk-3.0/gtk-dark.css            | 10 ++++++++--
 src/gtk-3.0/gtk-light.css           | 10 ++++++++--
 src/gtk-3.0/sass/_applications.scss |  5 ++++-
 src/gtk-3.0/sass/_common.scss       |  9 ++++++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 3aa8a43..9d4340d 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -720,14 +720,16 @@ modelbutton.flat, button:link, button:visited, button:link:hover, button:link:ac
 
 menuitem.button.flat,
 modelbutton.flat {
-  min-height: 24px;
+  transition: all 0.2s cubic-bezier(0, 0, 0.2, 1);
+  min-height: 26px;
   padding-left: 8px;
   padding-right: 8px;
   outline-offset: -3px;
   border-radius: 5px; }
   menuitem.button.flat:hover,
   modelbutton.flat:hover {
-    background-color: #444444; }
+    background-color: #444444;
+    transition-duration: 50ms; }
   menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow,
   modelbutton.flat:active,
   modelbutton.flat:active arrow,
@@ -4110,6 +4112,10 @@ window.background:not(.csd) > widget > button > button:active {
   background-image: image(rgba(119, 119, 119, 0.95));
   border: none;
   box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.12); }
+window.background:not(.csd) > menu > separator {
+  color: rgba(255, 255, 255, 0.12); }
+window.background:not(.csd) > menu > menuitem > label:disabled {
+  color: rgba(222, 222, 222, 0.45); }
 
 #MozillaGtkWidget.background {
   background-color: #333333; }
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 6f91c60..34c8e3c 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -723,14 +723,16 @@ modelbutton.flat, button:link, button:visited, button:link:hover, button:link:ac
 
 menuitem.button.flat,
 modelbutton.flat {
-  min-height: 24px;
+  transition: all 0.2s cubic-bezier(0, 0, 0.2, 1);
+  min-height: 26px;
   padding-left: 8px;
   padding-right: 8px;
   outline-offset: -3px;
   border-radius: 5px; }
   menuitem.button.flat:hover,
   modelbutton.flat:hover {
-    background-color: #ebebeb; }
+    background-color: #ebebeb;
+    transition-duration: 50ms; }
   menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow,
   modelbutton.flat:active,
   modelbutton.flat:active arrow,
@@ -4108,6 +4110,10 @@ window.background:not(.csd) > widget > button > button:active {
   background-image: image(#afafaf);
   border: none;
   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.11); }
+window.background:not(.csd) > menu > separator {
+  color: rgba(0, 0, 0, 0.11); }
+window.background:not(.csd) > menu > menuitem > label:disabled {
+  color: rgba(36, 36, 36, 0.55); }
 
 #MozillaGtkWidget.background {
   background-color: #f5f5f5; }
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 8029854..9283eb8 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1076,7 +1076,7 @@ panel-toplevel.background {
 
 .panel .menu .spinner,
 .menu .spinner {
-    opacity: 1
+    opacity: 1;
 } // Fixes sound indicator buttons
 
 //
@@ -1129,6 +1129,9 @@ window.background:not(.csd) {
       }
     }
   }
+
+  > menu > separator { color: $borders_color; }
+  > menu > menuitem > label:disabled { color: $insensitive_fg_color; }
 }
 
 // /*******************
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 9ea42b7..2662add 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -785,8 +785,8 @@ toolbar.inline-toolbar toolbutton {
 // menu buttons
 menuitem.button.flat,
 modelbutton.flat {
-//  transition: none;
-  min-height: 24px;
+  transition: $transition_2;
+  min-height: 26px;
   padding-left: 8px;
   padding-right: 8px;
   outline-offset: -3px;
@@ -794,7 +794,10 @@ modelbutton.flat {
 
   @extend %undecorated_button;
 
-  &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); }
+  &:hover {
+    background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%));
+    transition-duration: 50ms;
+  }
   &:active, &:selected { &, arrow { @include button(header-checked); } }
   &:checked { color: $fg_color; }
   &:disabled { color: $insensitive_fg_color; }