From c45d26b6a8040f203c99f7b0485be536f353dbf9 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 26 Dec 2020 22:19:07 +0800 Subject: [PATCH] update --- .../toggle-off.svg | 10 +- .../gnome-shell/assets-light/toggle-off.svg | 21 +++ .../common-assets/view-app-grid.svg | 123 ++++++++++++++++++ src/main/gnome-shell/gnome-shell-dark-alt.css | 10 +- .../gnome-shell-dark-solid-alt.css | 10 +- .../gnome-shell/gnome-shell-dark-solid.css | 10 +- src/main/gnome-shell/gnome-shell-dark.css | 10 +- .../gnome-shell/gnome-shell-light-alt.css | 10 +- .../gnome-shell-light-solid-alt.css | 10 +- .../gnome-shell/gnome-shell-light-solid.css | 10 +- src/main/gnome-shell/gnome-shell-light.css | 10 +- .../gnome-shell-theme.gresource.xml | 1 + src/sass/gnome-shell/_common.scss | 14 +- 13 files changed, 221 insertions(+), 28 deletions(-) rename src/assets/gnome-shell/{common-assets => assets-dark}/toggle-off.svg (69%) create mode 100644 src/assets/gnome-shell/assets-light/toggle-off.svg create mode 100644 src/assets/gnome-shell/common-assets/view-app-grid.svg diff --git a/src/assets/gnome-shell/common-assets/toggle-off.svg b/src/assets/gnome-shell/assets-dark/toggle-off.svg similarity index 69% rename from src/assets/gnome-shell/common-assets/toggle-off.svg rename to src/assets/gnome-shell/assets-dark/toggle-off.svg index 2eef977..dd2622b 100644 --- a/src/assets/gnome-shell/common-assets/toggle-off.svg +++ b/src/assets/gnome-shell/assets-dark/toggle-off.svg @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ - - - + + + - + diff --git a/src/assets/gnome-shell/assets-light/toggle-off.svg b/src/assets/gnome-shell/assets-light/toggle-off.svg new file mode 100644 index 0000000..a256723 --- /dev/null +++ b/src/assets/gnome-shell/assets-light/toggle-off.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/gnome-shell/common-assets/view-app-grid.svg b/src/assets/gnome-shell/common-assets/view-app-grid.svg new file mode 100644 index 0000000..c09082b --- /dev/null +++ b/src/assets/gnome-shell/common-assets/view-app-grid.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index 4fb6b87..6eb9173 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index b5b9dcf..deeb41d 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index b5b9dcf..deeb41d 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 4fb6b87..6eb9173 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index 62c7ac3..ed0a250 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index 002da07..d229eb5 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 002da07..d229eb5 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 766e406..193cf52 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -2557,15 +2557,21 @@ StWidget.focused .app-well-app-running-dot { background-color: rgba(255, 255, 255, 0.15); } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} + .show-apps .overview-icon { - color: white; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: white; + color: transparent; transition-duration: 150ms; } diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml index b5026a9..e89bd14 100644 --- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml +++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml @@ -15,6 +15,7 @@ assets/window-close-hover.svg assets/window-close-active.svg assets/activities.svg + assets/view-app-grid.svg assets/background.jpg icons/scalable/actions/color-pick.svg icons/scalable/status/eye-not-looking-symbolic.svg diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index 83e4198..fbddf02 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -2237,21 +2237,21 @@ StWidget.focused .app-well-app-running-dot { background-color: $light_divider_color; } -// .show-apps .show-apps-icon { -// color: transparent; -// background-image: url("assets/startup@2.svg"); -// background-size: contain; -// } +.show-apps .show-apps-icon { + color: transparent; + background-image: url("assets/view-app-grid.svg"); + background-size: contain; +} .show-apps .overview-icon { - color: $light_fg_color; + color: transparent; } .show-apps:hover .show-apps-icon, .show-apps:active .show-apps-icon, .show-apps:checked .show-apps-icon, .show-apps:focus .show-apps-icon { - color: $light_fg_color; + color: transparent; transition-duration: $longer_duration; }