From c3c0f88eb457af0eebd423dfc2d7ad0197ad9149 Mon Sep 17 00:00:00 2001 From: yutent Date: Tue, 7 Jun 2022 15:36:32 +0800 Subject: [PATCH] update --- cinnamon/assets/menu/menu-hover.svg | 117 ++------ cinnamon/assets/menu/menu-separator.svg | 61 +--- cinnamon/assets/menu/menu.svg | 128 +------- cinnamon/assets/menu/submenu.svg | 118 +------- cinnamon/assets/misc/add-workspace-active.svg | 140 ++------- cinnamon/assets/misc/add-workspace-hover.svg | 118 +------- cinnamon/assets/misc/add-workspace.svg | 118 +------- cinnamon/assets/misc/bg.svg | 128 +------- cinnamon/assets/misc/button-box.svg | 102 +------ .../assets/misc/calendar-arrow-left-hover.svg | 2 +- cinnamon/assets/misc/close-active.svg | 128 ++------ cinnamon/assets/misc/close-hover.svg | 128 ++------ cinnamon/assets/misc/close.svg | 128 ++------ cinnamon/assets/misc/corner-ripple.svg | 123 +------- cinnamon/assets/misc/desklet-header.svg | 159 +--------- cinnamon/assets/misc/desklet.svg | 153 +--------- cinnamon/assets/misc/message.svg | 95 +----- cinnamon/assets/misc/modal.svg | 181 +++-------- cinnamon/assets/misc/osd.svg | 153 ++-------- cinnamon/assets/misc/trash-icon.svg | 117 ++------ cinnamon/assets/panel/activities-active.svg | 167 +---------- cinnamon/assets/panel/activities.svg | 167 +---------- .../panel/window-list-active-bottom.svg | 147 +-------- .../assets/panel/window-list-active-top.svg | 147 +-------- cinnamon/assets/switch/switch-off.svg | 268 +++++------------ cinnamon/assets/switch/switch-on.svg | 283 ++++-------------- cinnamon/cinnamon.css | 14 +- cinnamon/sass/ui/workspace.scss | 14 +- gtk-2.0/gtkrc | 2 +- gtk-2.0/menubar-toolbar.rc | 14 +- gtk-2.0/panel.rc | 2 +- update-theme.sh | 20 +- 32 files changed, 433 insertions(+), 3209 deletions(-) diff --git a/cinnamon/assets/menu/menu-hover.svg b/cinnamon/assets/menu/menu-hover.svg index a023a8e..3bfc3ab 100644 --- a/cinnamon/assets/menu/menu-hover.svg +++ b/cinnamon/assets/menu/menu-hover.svg @@ -1,97 +1,20 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/menu/menu-separator.svg b/cinnamon/assets/menu/menu-separator.svg index 4962ebc..15bf9ab 100644 --- a/cinnamon/assets/menu/menu-separator.svg +++ b/cinnamon/assets/menu/menu-separator.svg @@ -1,60 +1 @@ - - - - - - - - - - image/svg+xml - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/menu/menu.svg b/cinnamon/assets/menu/menu.svg index 44e295d..5a0a5d9 100644 --- a/cinnamon/assets/menu/menu.svg +++ b/cinnamon/assets/menu/menu.svg @@ -1,127 +1 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/menu/submenu.svg b/cinnamon/assets/menu/submenu.svg index 9369544..600eb09 100644 --- a/cinnamon/assets/menu/submenu.svg +++ b/cinnamon/assets/menu/submenu.svg @@ -1,117 +1 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/add-workspace-active.svg b/cinnamon/assets/misc/add-workspace-active.svg index 4a54d61..02e99b9 100644 --- a/cinnamon/assets/misc/add-workspace-active.svg +++ b/cinnamon/assets/misc/add-workspace-active.svg @@ -1,117 +1,23 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/add-workspace-hover.svg b/cinnamon/assets/misc/add-workspace-hover.svg index ce48f5c..acc2f8f 100644 --- a/cinnamon/assets/misc/add-workspace-hover.svg +++ b/cinnamon/assets/misc/add-workspace-hover.svg @@ -1,117 +1 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/add-workspace.svg b/cinnamon/assets/misc/add-workspace.svg index 5b3ed52..266b4ab 100644 --- a/cinnamon/assets/misc/add-workspace.svg +++ b/cinnamon/assets/misc/add-workspace.svg @@ -1,117 +1 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/bg.svg b/cinnamon/assets/misc/bg.svg index feeddea..557661b 100644 --- a/cinnamon/assets/misc/bg.svg +++ b/cinnamon/assets/misc/bg.svg @@ -1,127 +1 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/button-box.svg b/cinnamon/assets/misc/button-box.svg index 0342698..cac1cca 100644 --- a/cinnamon/assets/misc/button-box.svg +++ b/cinnamon/assets/misc/button-box.svg @@ -1,101 +1 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/calendar-arrow-left-hover.svg b/cinnamon/assets/misc/calendar-arrow-left-hover.svg index 0ce6498..74143cc 100644 --- a/cinnamon/assets/misc/calendar-arrow-left-hover.svg +++ b/cinnamon/assets/misc/calendar-arrow-left-hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/cinnamon/assets/misc/close-active.svg b/cinnamon/assets/misc/close-active.svg index 95822bf..05fa768 100644 --- a/cinnamon/assets/misc/close-active.svg +++ b/cinnamon/assets/misc/close-active.svg @@ -1,100 +1,28 @@ - - - -image/svg+xml \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/close-hover.svg b/cinnamon/assets/misc/close-hover.svg index 7b52140..6696f8b 100644 --- a/cinnamon/assets/misc/close-hover.svg +++ b/cinnamon/assets/misc/close-hover.svg @@ -1,100 +1,28 @@ - - - -image/svg+xml \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/close.svg b/cinnamon/assets/misc/close.svg index e221a33..6c380eb 100644 --- a/cinnamon/assets/misc/close.svg +++ b/cinnamon/assets/misc/close.svg @@ -1,100 +1,28 @@ - - - -image/svg+xml \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/corner-ripple.svg b/cinnamon/assets/misc/corner-ripple.svg index 7f965ef..01e79d6 100644 --- a/cinnamon/assets/misc/corner-ripple.svg +++ b/cinnamon/assets/misc/corner-ripple.svg @@ -1,122 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/desklet-header.svg b/cinnamon/assets/misc/desklet-header.svg index a6e1054..8725eb8 100644 --- a/cinnamon/assets/misc/desklet-header.svg +++ b/cinnamon/assets/misc/desklet-header.svg @@ -1,158 +1 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/desklet.svg b/cinnamon/assets/misc/desklet.svg index 8445c61..ddf9d1d 100644 --- a/cinnamon/assets/misc/desklet.svg +++ b/cinnamon/assets/misc/desklet.svg @@ -1,152 +1 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/cinnamon/assets/misc/message.svg b/cinnamon/assets/misc/message.svg index b05e3a5..34aa62f 100644 --- a/cinnamon/assets/misc/message.svg +++ b/cinnamon/assets/misc/message.svg @@ -1,81 +1,14 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/modal.svg b/cinnamon/assets/misc/modal.svg index ec0b945..aa69fc1 100644 --- a/cinnamon/assets/misc/modal.svg +++ b/cinnamon/assets/misc/modal.svg @@ -1,143 +1,38 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/osd.svg b/cinnamon/assets/misc/osd.svg index df41a00..0c36366 100644 --- a/cinnamon/assets/misc/osd.svg +++ b/cinnamon/assets/misc/osd.svg @@ -1,127 +1,26 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/misc/trash-icon.svg b/cinnamon/assets/misc/trash-icon.svg index 61097dd..f300130 100644 --- a/cinnamon/assets/misc/trash-icon.svg +++ b/cinnamon/assets/misc/trash-icon.svg @@ -1,97 +1,20 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/cinnamon/assets/panel/activities-active.svg b/cinnamon/assets/panel/activities-active.svg index 6986f5c..995869a 100644 --- a/cinnamon/assets/panel/activities-active.svg +++ b/cinnamon/assets/panel/activities-active.svg @@ -1,158 +1,11 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - + + + + + - + \ No newline at end of file diff --git a/cinnamon/assets/panel/activities.svg b/cinnamon/assets/panel/activities.svg index b4a4b0d..9e4b401 100644 --- a/cinnamon/assets/panel/activities.svg +++ b/cinnamon/assets/panel/activities.svg @@ -1,158 +1,11 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - + + + + + - + \ No newline at end of file diff --git a/cinnamon/assets/panel/window-list-active-bottom.svg b/cinnamon/assets/panel/window-list-active-bottom.svg index b69b955..c4e1ee1 100644 --- a/cinnamon/assets/panel/window-list-active-bottom.svg +++ b/cinnamon/assets/panel/window-list-active-bottom.svg @@ -1,142 +1,7 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + + + - + \ No newline at end of file diff --git a/cinnamon/assets/panel/window-list-active-top.svg b/cinnamon/assets/panel/window-list-active-top.svg index 1800b3c..c5a4619 100644 --- a/cinnamon/assets/panel/window-list-active-top.svg +++ b/cinnamon/assets/panel/window-list-active-top.svg @@ -1,142 +1,7 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + + + - + \ No newline at end of file diff --git a/cinnamon/assets/switch/switch-off.svg b/cinnamon/assets/switch/switch-off.svg index 5d6df1f..689d12e 100644 --- a/cinnamon/assets/switch/switch-off.svg +++ b/cinnamon/assets/switch/switch-off.svg @@ -1,201 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + \ No newline at end of file diff --git a/cinnamon/assets/switch/switch-on.svg b/cinnamon/assets/switch/switch-on.svg index 8d84fd0..6968ee3 100644 --- a/cinnamon/assets/switch/switch-on.svg +++ b/cinnamon/assets/switch/switch-on.svg @@ -1,220 +1,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + \ No newline at end of file diff --git a/cinnamon/cinnamon.css b/cinnamon/cinnamon.css index db2f252..953f1bf 100644 --- a/cinnamon/cinnamon.css +++ b/cinnamon/cinnamon.css @@ -761,17 +761,17 @@ StScrollBar StButton#hhandle:active { padding: 8px; } .workspace-add-button { - background-image: url("common-assets/misc/add-workspace.svg"); + background-image: url("assets/misc/add-workspace.svg"); height: 200px; width: 35px; transition-duration: 100; } .workspace-add-button:hover { - background-image: url("common-assets/misc/add-workspace-hover.svg"); + background-image: url("assets/misc/add-workspace-hover.svg"); transition-duration: 100; } .workspace-add-button:active { - background-image: url("common-assets/misc/add-workspace-active.svg"); + background-image: url("assets/misc/add-workspace-active.svg"); transition-duration: 100; } .workspace-overview-background-shade { @@ -780,7 +780,7 @@ StScrollBar StButton#hhandle:active { .workspace-close-button, .window-close { - background-image: url("common-assets/misc/close.svg"); + background-image: url("assets/misc/close.svg"); background-size: 26px; height: 26px; width: 26px; @@ -788,21 +788,21 @@ StScrollBar StButton#hhandle:active { } .workspace-close-button:hover, .window-close:hover { - background-image: url("common-assets/misc/close-hover.svg"); + background-image: url("assets/misc/close-hover.svg"); background-size: 26px; height: 26px; width: 26px; } .workspace-close-button:active, .window-close:active { - background-image: url("common-assets/misc/close-active.svg"); + background-image: url("assets/misc/close-active.svg"); background-size: 26px; height: 26px; width: 26px; } .window-close-area { - background-image: url("common-assets/misc/trash-icon.svg"); + background-image: url("assets/misc/trash-icon.svg"); height: 120px; width: 400px; } diff --git a/cinnamon/sass/ui/workspace.scss b/cinnamon/sass/ui/workspace.scss index 5274b9b..7cce993 100644 --- a/cinnamon/sass/ui/workspace.scss +++ b/cinnamon/sass/ui/workspace.scss @@ -84,17 +84,17 @@ } &-add-button { - background-image: url('common-assets/misc/add-workspace.svg'); + background-image: url('assets/misc/add-workspace.svg'); height: 200px; width: 35px; transition-duration: 100; &:hover { - background-image: url('common-assets/misc/add-workspace-hover.svg'); + background-image: url('assets/misc/add-workspace-hover.svg'); transition-duration: 100; } &:active { - background-image: url('common-assets/misc/add-workspace-active.svg'); + background-image: url('assets/misc/add-workspace-active.svg'); transition-duration: 100; } } @@ -105,20 +105,20 @@ .workspace-close-button, .window-close { - background-image: url('common-assets/misc/close.svg'); + background-image: url('assets/misc/close.svg'); background-size: 26px; height: 26px; width: 26px; -cinnamon-close-overlap: 12px; &:hover { - background-image: url('common-assets/misc/close-hover.svg'); + background-image: url('assets/misc/close-hover.svg'); background-size: 26px; height: 26px; width: 26px; } &:active { - background-image: url('common-assets/misc/close-active.svg'); + background-image: url('assets/misc/close-active.svg'); background-size: 26px; height: 26px; width: 26px; @@ -135,7 +135,7 @@ //} .window-close-area { - background-image: url('common-assets/misc/trash-icon.svg'); + background-image: url('assets/misc/trash-icon.svg'); height: 120px; width: 400px; } diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index b2ee124..5454a96 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,4 +1,4 @@ -gtk-color-scheme = "base_color:#404040\nfg_color:#DADADA\ntooltip_fg_color:#4a4a4a\nselected_bg_color:#8fa876\nselected_fg_color:#FFFFFF\ntext_color:#D3D3D3\nbg_color:#383838\ninsensitive_bg_color:#3e3e3e\ninsensitive_fg_color:#7f7f7f\nnotebook_bg:#404040\ndark_sidebar_bg:#353535\ntooltip_bg_color:#fbeaa0\nlink_color:#5294E2\nmenu_bg:#383838\nmenu_separator_color:#303030" +gtk-color-scheme = "base_color:#3c4d5e\nfg_color:#ced6e0\ntooltip_fg_color:#4a4a4a\nselected_bg_color:#9ccef7\nselected_fg_color:#f2f5fc\ntext_color:#dae1e9\nbg_color:#57606f\ninsensitive_bg_color:#86909b\ninsensitive_fg_color:#ced6e0\nnotebook_bg:#404040\ndark_sidebar_bg:#353535\ntooltip_bg_color:#fbeaa0\nlink_color:#64b5f6\nmenu_bg:#383838\nmenu_separator_color:#303030" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/gtk-2.0/menubar-toolbar.rc b/gtk-2.0/menubar-toolbar.rc index 229a985..60d2604 100644 --- a/gtk-2.0/menubar-toolbar.rc +++ b/gtk-2.0/menubar-toolbar.rc @@ -1,9 +1,9 @@ style "menubar" { - bg[NORMAL] = "#2b2b2b" - fg[NORMAL] = "#dadada" - fg[PRELIGHT] = "#dadada" - fg[ACTIVE] = "#dadada" + bg[NORMAL] = "#57606f" + fg[NORMAL] = "#ced6e0" + fg[PRELIGHT] = "#f2f5fc" + fg[ACTIVE] = "#f2f5fc" fg[SELECTED] = @fg_color fg[INSENSITIVE] = shade(0.7, "#dadada") @@ -23,7 +23,7 @@ style "menubar" { style "menubar-borderless" { - bg[NORMAL] = "#2b2b2b" + bg[NORMAL] = "#57606f" fg[NORMAL] = "#dadada" fg[SELECTED] = @fg_color fg[INSENSITIVE] = shade(0.7, "#dadada") @@ -128,8 +128,8 @@ style "toolbar_button" { style "toolbar_entry" { xthickness = 6 - base[NORMAL] = "#414141" - base[INSENSITIVE] = "#393939" + base[NORMAL] = "#3c4d5e" + base[INSENSITIVE] = "#3c4d5e" text[NORMAL] = "#dadada" diff --git a/gtk-2.0/panel.rc b/gtk-2.0/panel.rc index bf1155a..6dea593 100644 --- a/gtk-2.0/panel.rc +++ b/gtk-2.0/panel.rc @@ -2,7 +2,7 @@ style "theme-panel" { ythickness = 0 - bg[NORMAL] = "#383838" + bg[NORMAL] = "#57606f" bg[ACTIVE] = @selected_bg_color bg[PRELIGHT] = shade(1.1, @selected_bg_color) bg[SELECTED] = @selected_bg_color diff --git a/update-theme.sh b/update-theme.sh index 0609859..4a6848d 100755 --- a/update-theme.sh +++ b/update-theme.sh @@ -14,15 +14,15 @@ gsettings set org.cinnamon.desktop.interface gtk-theme "one-dark" # gsettings set org.cinnamon.desktop.interface icon-theme "Mint-Y" # 桌面主题 -# echo "重置桌面主题……" -# gsettings set org.cinnamon.theme name "Mint-Y" -# echo "重置完成, 0.5秒之后, 修改为one-dark" -# sleep 0.5 -# gsettings set org.cinnamon.theme name "one-dark" +echo "重置桌面主题……" +gsettings set org.cinnamon.theme name "Mint-Y" +echo "重置完成, 0.5秒之后, 修改为one-dark" +sleep 0.5 +gsettings set org.cinnamon.theme name "one-dark" # 窗口主题 -# echo "重置窗口主题……" -# gsettings set org.cinnamon.desktop.wm.preferences theme "Mint-Y" -# echo "重置完成, 0.5秒之后, 修改为one-dark" -# sleep 0.5 -# gsettings set org.cinnamon.desktop.wm.preferences theme "one-dark" \ No newline at end of file +echo "重置窗口主题……" +gsettings set org.cinnamon.desktop.wm.preferences theme "Mint-Y" +echo "重置完成, 0.5秒之后, 修改为one-dark" +sleep 0.5 +gsettings set org.cinnamon.desktop.wm.preferences theme "one-dark" \ No newline at end of file