From 46cd2720891fd21797e9162b870001dc49723144 Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Fri, 13 May 2022 19:46:55 +0800
Subject: [PATCH] update

---
 gtk-3.0/gtk.css                | 27 ++++++++++++++-------------
 gtk-3.0/sass/common.scss       |  4 ++--
 gtk-3.0/sass/ui/basic.scss     |  6 +++---
 gtk-3.0/sass/ui/scrollbar.scss | 10 +++++-----
 gtk-3.0/sass/ui/treeview.scss  | 12 +++++++++---
 gtk-3.0/sass/var/colors.scss   |  2 ++
 6 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 01b69fe..189adf3 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -33,8 +33,8 @@ row:selected button.flat:disabled label {
 
 infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover, row:selected button:hover {
   color: #f2f5fc;
-  background-color: rgba(242, 245, 252, 0.2);
-  border-color: rgba(242, 245, 252, 0.8);
+  background-color: rgba(100, 181, 246, 0.35);
+  border-color: rgba(100, 181, 246, 0.35);
 }
 .primary-toolbar toolbar.selection-mode button:active,
 .selection-mode.primary-toolbar button:active, .primary-toolbar .selection-mode.inline-toolbar button:active, headerbar.selection-mode button:active, .primary-toolbar toolbar.selection-mode button:checked,
@@ -177,8 +177,8 @@ textview border {
 
 rubberband, .content-view rubberband, treeview.view rubberband, flowbox rubberband,
 .rubberband {
-  border: 1px solid rgba(52, 158, 243, 0.35);
-  background-colo: #f30;
+  border: 1px solid rgba(100, 181, 246, 0.35);
+  background-color: rgba(100, 181, 246, 0.15);
 }
 
 flowbox flowboxchild {
@@ -1703,12 +1703,12 @@ treeview.view {
   border-top-color: rgba(0, 0, 0, 0.1);
 }
 * {
-  -GtkTreeView-horizontal-separator: 4;
+  -GtkTreeView-horizontal-separator: 0;
   -GtkTreeView-grid-line-width: 1;
   -GtkTreeView-grid-line-pattern: "";
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: "";
-  -GtkTreeView-expander-size: 16;
+  -GtkTreeView-expander-size: 0;
 }
 
 treeview.view acceleditor > label {
@@ -1742,6 +1742,7 @@ treeview.view:drop(active).before {
 }
 treeview.view.expander {
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+  background-color: #f30;
   color: #85929f;
 }
 treeview.view.expander:dir(rtl) {
@@ -1792,7 +1793,7 @@ treeview.view header button {
   border-color: #86909b;
 }
 treeview.view header button:active, treeview.view header button:hover {
-  background-color: #5b6575;
+  background-color: #64b5f6;
 }
 treeview.view header button:active:hover {
   color: #ced6e0;
@@ -2193,7 +2194,7 @@ notebook > header button.flat {
 }
 
 scrollbar {
-  background-color: rgba(60, 77, 94, 0.3);
+  background-color: rgba(60, 77, 94, 0.5);
   transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 * {
@@ -2203,16 +2204,16 @@ scrollbar {
 }
 
 scrollbar.top {
-  border-bottom: 1px solid #86909b;
+  border-bottom: 1px solid #3c4d5e;
 }
 scrollbar.bottom {
-  border-top: 1px solid #86909b;
+  border-top: 1px solid #3c4d5e;
 }
 scrollbar.left {
-  border-right: 1px solid #86909b;
+  border-right: 1px solid #3c4d5e;
 }
 scrollbar.right {
-  border-left: 1px solid #86909b;
+  border-left: 1px solid #3c4d5e;
 }
 scrollbar button {
   border: none;
@@ -2367,7 +2368,7 @@ scrolledwindow undershoot.right {
 scrolledwindow junction {
   border-color: transparent;
   border-image: linear-gradient(to bottom, #86909b 1px, transparent 1px) 0 0 0 1/0 1px stretch;
-  background-color: rgba(60, 77, 94, 0.3);
+  background-color: rgba(60, 77, 94, 0.5);
 }
 scrolledwindow junction:dir(rtl) {
   border-image-slice: 0 1 0 0;
diff --git a/gtk-3.0/sass/common.scss b/gtk-3.0/sass/common.scss
index a308912..0c4a0bf 100644
--- a/gtk-3.0/sass/common.scss
+++ b/gtk-3.0/sass/common.scss
@@ -26,8 +26,8 @@
   }
   &:hover {
     color: $selected_fg_color;
-    background-color: transparentize($selected_fg_color, 0.8);
-    border-color: transparentize($selected_fg_color, 0.2);
+    background-color: $selected_bg_color;
+    border-color: $selected_bg_color;
   }
   @at-root %selected_button_active,
     &:active,
diff --git a/gtk-3.0/sass/ui/basic.scss b/gtk-3.0/sass/ui/basic.scss
index d73f2f9..66ec21c 100644
--- a/gtk-3.0/sass/ui/basic.scss
+++ b/gtk-3.0/sass/ui/basic.scss
@@ -96,11 +96,11 @@ iconview {
   @extend .view;
 }
 
+// 鼠标滑动选中的框框样式
 rubberband,
 .rubberband {
-  border: 1px solid darken($selected_bg_color, 10%);
-  // background-color: transparentize(darken($selected_bg_color, 10%), 0.8);
-  background-colo:#f30;
+  border: 1px solid $selected_bg_color;
+  background-color: transparentize($selected_bg_color, 0.2);
 }
 
 flowbox {
diff --git a/gtk-3.0/sass/ui/scrollbar.scss b/gtk-3.0/sass/ui/scrollbar.scss
index 28f4751..8f9f81f 100644
--- a/gtk-3.0/sass/ui/scrollbar.scss
+++ b/gtk-3.0/sass/ui/scrollbar.scss
@@ -1,7 +1,7 @@
 //
 // Scrollbars
 //
-$_scrollbar_bg_color: transparentize($base_color, 0.7);
+$_scrollbar_bg_color: transparentize($base_color, 0.5);
 
 scrollbar {
   @at-root * {
@@ -16,19 +16,19 @@ scrollbar {
   transition: 300ms $ease-out-quad;
 
   &.top {
-    border-bottom: 1px solid $borders_color;
+    border-bottom: 1px solid $base_color;
   }
 
   &.bottom {
-    border-top: 1px solid $borders_color;
+    border-top: 1px solid $base_color;
   }
 
   &.left {
-    border-right: 1px solid $borders_color;
+    border-right: 1px solid $base_color;
   }
 
   &.right {
-    border-left: 1px solid $borders_color;
+    border-left: 1px solid $base_color;
   }
 
   button {
diff --git a/gtk-3.0/sass/ui/treeview.scss b/gtk-3.0/sass/ui/treeview.scss
index b3188f5..559c469 100644
--- a/gtk-3.0/sass/ui/treeview.scss
+++ b/gtk-3.0/sass/ui/treeview.scss
@@ -1,16 +1,19 @@
 //
 // Tree Views
 //
+
 treeview.view {
   @at-root * {
-    -GtkTreeView-horizontal-separator: 4;
+    -GtkTreeView-horizontal-separator: 0;
     -GtkTreeView-grid-line-width: 1;
     -GtkTreeView-grid-line-pattern: '';
     -GtkTreeView-tree-line-width: 1;
     -GtkTreeView-tree-line-pattern: '';
-    -GtkTreeView-expander-size: 16;
+    // 树形菜单的小箭头, 设为0, 就不给折叠了
+    -GtkTreeView-expander-size: 0;
   }
 
+
   border-left-color: transparentize($fg_color, 0.85); // this is actually the tree lines color,
   border-top-color: transparentize(
     black,
@@ -64,6 +67,8 @@ treeview.view {
 
   &.expander {
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+    background-color: #f30;
+
     &:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl');
     }
@@ -117,6 +122,7 @@ treeview.view {
   }
 
   header {
+
     button {
       $_column_header_color: mix($fg_color, $base_color, 80%);
 
@@ -132,7 +138,7 @@ treeview.view {
 
       &:active,
       &:hover {
-        background-color: lighten($bg_color, 2%);
+        background-color: $highlight_color;
       }
       &:active:hover {
         color: $fg_color;
diff --git a/gtk-3.0/sass/var/colors.scss b/gtk-3.0/sass/var/colors.scss
index 1c19d3d..acbd1b9 100644
--- a/gtk-3.0/sass/var/colors.scss
+++ b/gtk-3.0/sass/var/colors.scss
@@ -15,6 +15,8 @@ $grey_color: #86909b;
 $selected_bg_color: rgba(100, 181, 246, 0.35);
 $selected_fg_color: #f2f5fc;
 
+$highlight_color: #64b5f6;
+
 $selected_borders_color: darken($selected_bg_color, 15%);
 $borders_color: $grey_color;
 $separator_color: transparentize($grey_color, .5);