From 54cb4c847de8ef8fabc88fae7c147a2e352bb70d Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Sat, 7 May 2022 20:25:38 +0800
Subject: [PATCH] update

---
 .vscode/settings.json           |  3 ++
 Readme.md                       |  3 ++
 cinnamon/cinnamon.css           |  4 +--
 cinnamon/sass/ui/calendar.scss  |  2 +-
 metacity-1/button-bg.svg        |  2 +-
 metacity-1/mac-close.svg        |  8 +++++
 metacity-1/mac-close_a.svg      | 12 +++++++
 metacity-1/mac-max.svg          |  8 +++++
 metacity-1/mac-max_a.svg        | 10 ++++++
 metacity-1/mac-min.svg          |  8 +++++
 metacity-1/mac-min_a.svg        | 11 +++++++
 metacity-1/metacity-theme-3.xml | 58 +++++++++++++--------------------
 metacity-1/restore-icon.svg     | 16 ++++++++-
 update-theme.sh                 |  0
 14 files changed, 104 insertions(+), 41 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100755 metacity-1/mac-close.svg
 create mode 100755 metacity-1/mac-close_a.svg
 create mode 100755 metacity-1/mac-max.svg
 create mode 100755 metacity-1/mac-max_a.svg
 create mode 100755 metacity-1/mac-min.svg
 create mode 100755 metacity-1/mac-min_a.svg
 mode change 100644 => 100755 update-theme.sh

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..e83af87
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "svg.preview.background": "transparent"
+}
diff --git a/Readme.md b/Readme.md
index 8229337..1560748 100644
--- a/Readme.md
+++ b/Readme.md
@@ -27,6 +27,7 @@
   --color-orange-3: rgb(245, 189, 7);
   /* default1 */
   --color-plain-a: rgba(150, 204, 248, 0.35);
+  --color-plain-a: #96ccf859;
   --color-plain-1: #f2f5fc;
   --color-plain-2: #e8ebf4;
   --color-plain-3: #dae1e9;
@@ -38,6 +39,8 @@
   /* inverse */
   --color-dark-a: rgba(87, 96, 111, 0.35);
   --color-dark-1: #57606f;
+  --color-dark-12: #4d535d;
+  --color-dark-13: #44484d;
   --color-dark-2: #3c4d5e;
   --color-dark-3: #323f4d;
 }
diff --git a/cinnamon/cinnamon.css b/cinnamon/cinnamon.css
index a3f9975..d8b6f64 100644
--- a/cinnamon/cinnamon.css
+++ b/cinnamon/cinnamon.css
@@ -549,7 +549,7 @@ StScrollBar StButton#hhandle:active {
   padding: 0;
 }
 .calendar-today-home-button-enabled:hover {
-  color: rgb(100, 181, 246);
+  color: #64b5f6;
 }
 .calendar-today-home-button-enabled:hover .calendar-today-day-label,
 .calendar-today-home-button-enabled:hover .calendar-today-date-label {
@@ -567,7 +567,7 @@ StScrollBar StButton#hhandle:active {
 .calendar-change-month-forward {
   width: 32px;
   height: 32px;
-  background-size: 32px;
+  background-size: 28px;
 }
 
 .calendar-change-month-back {
diff --git a/cinnamon/sass/ui/calendar.scss b/cinnamon/sass/ui/calendar.scss
index 9119a91..9b87654 100644
--- a/cinnamon/sass/ui/calendar.scss
+++ b/cinnamon/sass/ui/calendar.scss
@@ -182,7 +182,7 @@
 .calendar-change-month-forward {
   width: 32px;
   height: 32px;
-  background-size: 32px;
+  background-size: 28px;
 }
 
 //arrow back
diff --git a/metacity-1/button-bg.svg b/metacity-1/button-bg.svg
index 16dd6fa..51cd684 100644
--- a/metacity-1/button-bg.svg
+++ b/metacity-1/button-bg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" fill="#a4b0be"><circle cy="8" cx="8" r="8" /></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" fill="#86909b"><circle cy="8" cx="8" r="8" /></svg>
\ No newline at end of file
diff --git a/metacity-1/mac-close.svg b/metacity-1/mac-close.svg
new file mode 100755
index 0000000..20f66e1
--- /dev/null
+++ b/metacity-1/mac-close.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M445.83 892C233.72 891.87 51 742.42 8.93 534.56s68-416.63 263.31-499.29c226.93-95.85 488.61 10.38 584.48 237.28S846.35 761.1 619.42 857a443.33 443.33 0 01-173.59 35z"
+    fill="#d84945" />
+  <path
+    d="M445.83 35.07c-195.54.12-363.94 137.9-402.76 329.52s62.67 384.08 242.74 460.28a411.17 411.17 0 10160-789.8z"
+    fill="#f55449" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/mac-close_a.svg b/metacity-1/mac-close_a.svg
new file mode 100755
index 0000000..ce146d8
--- /dev/null
+++ b/metacity-1/mac-close_a.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M445.83 892C233.72 891.87 51 742.42 8.93 534.56s68-416.63 263.31-499.29c226.93-95.85 488.61 10.38 584.48 237.28S846.35 761.1 619.42 857a443.33 443.33 0 01-173.59 35z"
+    fill="#d84945" />
+  <path
+    d="M445.83 35.07c-195.54.12-363.94 137.9-402.76 329.52s62.67 384.08 242.74 460.28a411.17 411.17 0 10160-789.8z"
+    fill="#f55449" />
+  <path fill="#3c4d5e"
+    d="M642.08 293.27L293.27 642.08q-22.11 22.11-44.22 0t0-44.22l348.81-348.8q22.11-22.12 44.22 0t0 44.21zm0 0" />
+  <path fill="#3c4d5e"
+    d="M598.73 643L249.92 294.14q-22.1-22.11 0-44.22t44.22 0L643 598.73q22 22.11 0 44.27t-44.22 0zm0 0" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/mac-max.svg b/metacity-1/mac-max.svg
new file mode 100755
index 0000000..8e658b1
--- /dev/null
+++ b/metacity-1/mac-max.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M0 446c0 246.32 199.68 446 446 446s446-199.68 446-446S692.32 0 446 0 0 199.68 0 446z"
+    fill="#34c63b" />
+  <path
+    d="M445.89 34.89A411.16 411.16 0 0043.17 364.42C4.35 556 105.84 748.49 285.89 824.7a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/mac-max_a.svg b/metacity-1/mac-max_a.svg
new file mode 100755
index 0000000..db67eee
--- /dev/null
+++ b/metacity-1/mac-max_a.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M0 446c0 246.32 199.68 446 446 446s446-199.68 446-446S692.32 0 446 0 0 199.68 0 446z"
+    fill="#34c63b" />
+  <path
+    d="M445.89 34.89A411.16 411.16 0 0043.17 364.42C4.35 556 105.84 748.49 285.89 824.7a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+  <path fill="#3c4d5e"
+    d="M351.39 247.74a25.33 25.33 0 0118.49-7.67L628.21 238A25.27 25.27 0 01654 263.79l-2 258.29a25.85 25.85 0 01-7.68 18.49 25.1 25.1 0 01-18.49 7.67 24.82 24.82 0 01-18.38-7.4L351.16 284.57a24.37 24.37 0 01-7.4-18.38 25.28 25.28 0 017.63-18.46zM540.61 644.29a25.31 25.31 0 01-18.47 7.64L263.79 654A25.28 25.28 0 01238 628.21l2-258.29a25.83 25.83 0 017.67-18.47 25.09 25.09 0 0118.49-7.67 24.78 24.78 0 0118.38 7.4l256.3 256.25a24.37 24.37 0 017.4 18.38 25.33 25.33 0 01-7.63 18.48z" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/mac-min.svg b/metacity-1/mac-min.svg
new file mode 100755
index 0000000..5c89a9d
--- /dev/null
+++ b/metacity-1/mac-min.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M0 446c0 246.32 199.68 446 446 446s446-199.68 446-446S692.32 0 446 0 0 199.68 0 446z"
+    fill="#d8a932" />
+  <path
+    d="M445.89 34.89A411.16 411.16 0 0043.17 364.42C4.35 556 105.84 748.49 285.89 824.7a411.17 411.17 0 10160-789.81z"
+    fill="#fac536" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/mac-min_a.svg b/metacity-1/mac-min_a.svg
new file mode 100755
index 0000000..d13b3f0
--- /dev/null
+++ b/metacity-1/mac-min_a.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 892 892" height="16" width="16">
+  <path
+    d="M0 446c0 246.32 199.68 446 446 446s446-199.68 446-446S692.32 0 446 0 0 199.68 0 446z"
+    fill="#d8a932" />
+  <path
+    d="M445.89 34.89A411.16 411.16 0 0043.17 364.42C4.35 556 105.84 748.49 285.89 824.7a411.17 411.17 0 10160-789.81z"
+    fill="#fac536" />
+  <path
+    d="M247.2 414h397.6q25.2 0 25.2 32t-25.2 32H247.2q-25.2 0-25.2-32t25.2-32z"
+    fill="#3c4d5e" />
+</svg>
\ No newline at end of file
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index 82a9050..da8f97e 100644
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -15,8 +15,8 @@
 <constant name="C_title_unfocused" value="#86909b"/>
 
 <!-- 标题栏背景 -->
-<constant name="C_wm_bg" value="#57606f" />
-<constant name="C_wm_bg_unfocused" value="#57606f" />
+<constant name="C_wm_bg" value="#4d535d" />
+<constant name="C_wm_bg_unfocused" value="#4d535d" />
 
 <!-- 窗口边框 -->
 <constant name="C_wm_border" value="#57606f" />
@@ -278,86 +278,72 @@
   <image filename="menu-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
-<!-- close icon -->
-
+<!-- 关闭图标 icon -->
 <draw_ops name="close_focused">
-  <image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-close.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-close_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="close-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-close_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-  <image filename="button-bg.svg" colorize="C_button_close_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
-<!--maximize-->
+<!--最大化图标-->
 <draw_ops name="maximize_focused">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-max.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-max_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="max-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-max_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
-<!--unmaximize-->
+<!--已最大化图标-->
 <draw_ops name="unmaximize_focused">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-max.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_maximize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="restore-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="restore-icon.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="unmaximize_unfocused">
-  <image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="restore-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
-<!--minimize-->
+<!--最小化图标-->
 <draw_ops name="minimize_focused">
-  <image filename="button-bg.svg" colorize="C_button_minimize_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-min.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-  <image filename="button-bg.svg" colorize="C_button_minimize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-min_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-  <image filename="button-bg.svg" colorize="C_button_minimize_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-  <image filename="min-icon.svg" colorize="C_icon_color" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="mac-min_a.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-  <image filename="button-bg.svg" colorize="C_button_minimize_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+  <image filename="button-bg.svg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!-- shade icon -->
diff --git a/metacity-1/restore-icon.svg b/metacity-1/restore-icon.svg
index f37c129..2ec4acf 100644
--- a/metacity-1/restore-icon.svg
+++ b/metacity-1/restore-icon.svg
@@ -1 +1,15 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><g fill="#86909b"><path d="M3 5v8h8V5zm1 1h6v6H4z"/><path d="M5 3v1h7v7h1V3z" opacity=".5"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 892 892" height="16" width="16"
+  xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M0 446c0 246.32 199.68 446 446 446s446-199.68 446-446S692.32 0 446 0 0 199.68 0 446z"
+    fill="#34c63b" />
+  <path
+    d="M445.89 34.89A411.16 411.16 0 0043.17 364.42C4.35 556 105.84 748.49 285.89 824.7a411.17 411.17 0 10160-789.81z"
+    fill="#39ea49" />
+  <g fill="#3c4d5e">
+    <path
+      d="M220.265 310.559v361.176H581.44V310.56zm45.147 45.147h270.882v270.882H265.412z" />
+    <path d="M310.559 220.265v45.147h316.029v316.03h45.147V220.264z"
+      opacity=".5" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/update-theme.sh b/update-theme.sh
old mode 100644
new mode 100755