From 3922e95bd2598042d373e7ca4771ea6a33b7aabe Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 10 Feb 2018 23:00:06 +0800
Subject: [PATCH] Fixed bugs

---
 src/gnome-shell/gnome-shell-dark.css  |  2 +-
 src/gnome-shell/gnome-shell-light.css |  2 +-
 src/gnome-shell/sass/_common.scss     |  2 +-
 src/gtk-3.0/gtk-dark.css              | 35 +++++++++++++++------------
 src/gtk-3.0/gtk-light.css             | 25 +++++++++++--------
 src/gtk-3.0/sass/_applications.scss   |  4 +--
 src/gtk-3.0/sass/_common.scss         |  6 ++---
 src/gtk-3.0/sass/_drawing.scss        |  5 ++--
 8 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/gnome-shell/gnome-shell-dark.css b/src/gnome-shell/gnome-shell-dark.css
index 4631047..462f579 100644
--- a/src/gnome-shell/gnome-shell-dark.css
+++ b/src/gnome-shell/gnome-shell-dark.css
@@ -2104,7 +2104,7 @@ StScrollBar {
   box-shadow: 0 19px 19px rgba(0, 0, 0, 0.6), 0 15px 6px rgba(0, 0, 0, 0.44); }
 
 #lockDialogGroup {
-  background: rgba(0, 0, 0, 0.6) url("assets/noise-texture.svg");
+  background: #555555 url("assets/noise-texture.svg");
   background-size: cover; }
 
 #LookingGlassDialog {
diff --git a/src/gnome-shell/gnome-shell-light.css b/src/gnome-shell/gnome-shell-light.css
index dee2428..6fb3033 100644
--- a/src/gnome-shell/gnome-shell-light.css
+++ b/src/gnome-shell/gnome-shell-light.css
@@ -2104,7 +2104,7 @@ StScrollBar {
   box-shadow: 0 19px 19px rgba(0, 0, 0, 0.6), 0 15px 6px rgba(0, 0, 0, 0.44); }
 
 #lockDialogGroup {
-  background: rgba(0, 0, 0, 0.6) url("assets/noise-texture.svg");
+  background: #555555 url("assets/noise-texture.svg");
   background-size: cover; }
 
 #LookingGlassDialog {
diff --git a/src/gnome-shell/sass/_common.scss b/src/gnome-shell/sass/_common.scss
index af3fede..1a7e81c 100644
--- a/src/gnome-shell/sass/_common.scss
+++ b/src/gnome-shell/sass/_common.scss
@@ -2172,7 +2172,7 @@ $slider_color: if($variant == 'light', white, white);
 }
 
 #lockDialogGroup {
-  background: $bg_color url("assets/noise-texture.svg");
+  background: #555555 url("assets/noise-texture.svg");
   background-size: cover;
 }
 
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 2825e9e..92ee7a6 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -268,7 +268,7 @@ treeview entry.flat, treeview entry {
   to {
     background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#0062FF), to(transparent)); } }
 button {
-  min-height: 24px;
+  min-height: 26px;
   min-width: 16px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   border: 1px solid;
@@ -1065,7 +1065,7 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w
     opacity: 0.6; }
 
 headerbar entry, .nemo-window .primary-toolbar entry {
-  min-height: 24px;
+  min-height: 26px;
   border: none;
   color: rgba(225, 219, 219, 0.8);
   background-color: rgba(119, 119, 119, 0.55);
@@ -1128,9 +1128,10 @@ headerbar button,
     background-image: none; }
   headerbar button:hover,
   .nemo-window .primary-toolbar button:hover {
-    color: rgba(225, 219, 219, 0.8);
+    color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.85);
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+    background-image: none;
+    box-shadow: none;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   headerbar button:checked,
   .nemo-window .primary-toolbar button:checked {
@@ -1215,9 +1216,10 @@ headerbar .linked:not(.vertical).path-bar > button,
   headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
   headerbar .linked:not(.vertical).path-bar > button:hover,
   .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
-    color: rgba(225, 219, 219, 0.8);
+    color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.85);
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: none;
+    box-shadow: none; }
   headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active,
   headerbar .linked:not(.vertical).path-bar > button:active,
   .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:active {
@@ -1388,9 +1390,10 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
   color: rgba(225, 219, 219, 0.8);
   caret-color: rgba(225, 219, 219, 0.8); }
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
-  color: rgba(225, 219, 219, 0.8);
+  color: rgba(221, 213, 213, 0.8);
   background-color: rgba(119, 119, 119, 0.85);
-  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+  background-image: none;
+  box-shadow: none; }
 headerbar spinbutton:not(.vertical) button:hover, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:hover {
   background-color: rgba(157, 157, 157, 0.55); }
 headerbar spinbutton:not(.vertical) button:active, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:active, headerbar spinbutton:not(.vertical) button:checked, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:checked {
@@ -1566,7 +1569,7 @@ treeview.view {
       border-radius: 5px;
       border-width: 0; }
   treeview.view header button {
-    min-height: 24px;
+    min-height: 26px;
     min-width: 38px;
     padding: 0 6px;
     font-weight: bold;
@@ -3270,9 +3273,10 @@ headerbar button.titlebutton,
   background-color: rgba(55, 55, 55, 0); }
   headerbar button.titlebutton:hover,
   .titlebar button.titlebutton:hover {
-    color: rgba(225, 219, 219, 0.8);
+    color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.85);
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: none;
+    box-shadow: none; }
   headerbar button.titlebutton:active, headerbar button.titlebutton:checked,
   .titlebar button.titlebutton:active,
   .titlebar button.titlebutton:checked {
@@ -3474,9 +3478,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
-    color: rgba(225, 219, 219, 0.8);
+    color: rgba(221, 213, 213, 0.8);
     background-color: rgba(119, 119, 119, 0.85);
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: none;
+    box-shadow: none; }
   100% {
     color: #ffffff;
     background-color: rgba(119, 119, 119, 0.95);
@@ -4176,10 +4181,10 @@ window.background:not(.csd) > menu > menuitem > label:disabled {
   #MozillaGtkWidget.background > widget separator {
     background-color: rgba(255, 255, 255, 0.12); }
   #MozillaGtkWidget.background > widget > scrolledwindow > textview {
-    background-color: #666666; }
+    background-color: #404040; }
     #MozillaGtkWidget.background > widget > scrolledwindow > textview text {
       background-color: transparent;
-      color: #fdfdfd; }
+      color: #aaaaaa; }
 
 /***************
  * Chrome(ium) *
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 1d23882..8be1a7b 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -1128,9 +1128,10 @@ headerbar button,
     background-image: none; }
   headerbar button:hover,
   .nemo-window .primary-toolbar button:hover {
-    color: rgba(40, 32, 32, 0.8);
+    color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+    background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+    box-shadow: none;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   headerbar button:checked,
   .nemo-window .primary-toolbar button:checked {
@@ -1215,9 +1216,10 @@ headerbar .linked:not(.vertical).path-bar > button,
   headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
   headerbar .linked:not(.vertical).path-bar > button:hover,
   .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:hover {
-    color: rgba(40, 32, 32, 0.8);
+    color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+    box-shadow: none; }
   headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active,
   headerbar .linked:not(.vertical).path-bar > button:active,
   .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:active {
@@ -1388,9 +1390,10 @@ headerbar spinbutton:not(.vertical):focus, .nemo-window .primary-toolbar spinbut
   color: rgba(40, 32, 32, 0.8);
   caret-color: rgba(40, 32, 32, 0.8); }
 headerbar spinbutton:not(.vertical) button, .nemo-window .primary-toolbar spinbutton:not(.vertical) button, headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled {
-  color: rgba(40, 32, 32, 0.8);
+  color: rgba(34, 28, 28, 0.8);
   background-color: #fafafa;
-  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+  background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+  box-shadow: none; }
 headerbar spinbutton:not(.vertical) button:hover, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:hover {
   background-color: white; }
 headerbar spinbutton:not(.vertical) button:active, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:active, headerbar spinbutton:not(.vertical) button:checked, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:checked {
@@ -3269,9 +3272,10 @@ headerbar button.titlebutton,
   background-color: rgba(229, 229, 229, 0); }
   headerbar button.titlebutton:hover,
   .titlebar button.titlebutton:hover {
-    color: rgba(40, 32, 32, 0.8);
+    color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+    box-shadow: none; }
   headerbar button.titlebutton:active, headerbar button.titlebutton:checked,
   .titlebar button.titlebutton:active,
   .titlebar button.titlebutton:checked {
@@ -3473,9 +3477,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 @keyframes needs_attention_keyframes {
   0% {
-    color: rgba(40, 32, 32, 0.8);
+    color: rgba(34, 28, 28, 0.8);
     background-color: #fafafa;
-    box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
+    background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+    box-shadow: none; }
   100% {
     color: #ffffff;
     background-color: #afafaf;
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index 59deec8..bc8d9c1 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -1214,11 +1214,11 @@ window.background:not(.csd) {
     // FIXME: this affected to popover widget as well,
     // so we can not set $lighter_bg_color to search-bar...
     > scrolledwindow > textview {
-      background-color: if($variant == 'light', $base_color, lighten($bg_color, 20%));
+      background-color: if($variant == 'light', $base_color, lighten($bg_color, 5%));
 
       text {
         background-color: transparent;
-        color: if($variant =='light', #242424, #fdfdfd);
+        color: if($variant =='light', #242424, #aaaaaa);
         &:selected,
         &:selected:focus,
         selection { @extend %selected_items; }
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 5b09460..d4426f0 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -366,7 +366,7 @@ $_dot_color: $selected_bg_color;
 }
 
 button {
-  min-height: 24px;
+  min-height: if($variant =='light', 24px, 26px);
   min-width: 16px;
   transition: $button_transition;
   border: 1px solid;
@@ -1237,7 +1237,7 @@ headerbar {
 
   // Headerbar Entries
   entry {
-    min-height: 24px;
+    min-height: if($variant =='light', 24px, 26px);
     @include entry(header-normal);
 
     &:backdrop { opacity: 0.85; }
@@ -1684,7 +1684,7 @@ treeview.view {
     button {
       $_column_header_color: mix($fg_color,$base_color,80%);
 
-      min-height: 24px;
+      min-height: if($variant =='light', 24px, 26px);
       min-width: 38px;
       padding: 0 6px;
       font-weight: bold;
diff --git a/src/gtk-3.0/sass/_drawing.scss b/src/gtk-3.0/sass/_drawing.scss
index b6e97e6..13a9d5b 100644
--- a/src/gtk-3.0/sass/_drawing.scss
+++ b/src/gtk-3.0/sass/_drawing.scss
@@ -274,9 +274,10 @@ $animation_1: needs_attention 0.3s cubic-bezier(0, 0, 0.2, 1);
   //
   // hovered header-bar button
   //
-    color: $header_fg;
+    color: darken($header_fg, 2%);
     background-color: $header_button_hover_bg;
-    box-shadow: $shadow_3;
+    background-image: if($variant=='light', linear-gradient( 0deg, #f8f8f8 0%, #ffffff 100%), none);
+    box-shadow: none;
   }
 
   @else if $t==header-active {