From 3244a53e6ee96dc8e9fd54c7329232f971162ebe Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 28 Sep 2018 20:03:14 +0900 Subject: [PATCH] wip --- src/client/app/desktop/assets/header-icon.dark.svg | 3 --- src/client/app/desktop/assets/header-icon.light.svg | 3 --- src/client/app/desktop/assets/header-icon.svg | 3 +++ src/client/app/desktop/views/components/ui.header.vue | 11 ++++++----- src/client/theme/dark.json | 1 - src/client/theme/light.json | 1 - 6 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 src/client/app/desktop/assets/header-icon.dark.svg delete mode 100644 src/client/app/desktop/assets/header-icon.light.svg create mode 100644 src/client/app/desktop/assets/header-icon.svg diff --git a/src/client/app/desktop/assets/header-icon.dark.svg b/src/client/app/desktop/assets/header-icon.dark.svg deleted file mode 100644 index 6983494cc..000000000 --- a/src/client/app/desktop/assets/header-icon.dark.svg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01b0bea10d65f1594172ed7dfc59b10d8c8f7e48bd30b45923e71063fcca68e9 -size 7175 diff --git a/src/client/app/desktop/assets/header-icon.light.svg b/src/client/app/desktop/assets/header-icon.light.svg deleted file mode 100644 index 7a1a485db..000000000 --- a/src/client/app/desktop/assets/header-icon.light.svg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e302c5e37510cb35e904d62caf3e3202677269399dc7eda3c63434e220143566 -size 7167 diff --git a/src/client/app/desktop/assets/header-icon.svg b/src/client/app/desktop/assets/header-icon.svg new file mode 100644 index 000000000..2a6e46737 --- /dev/null +++ b/src/client/app/desktop/assets/header-icon.svg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2db9644e4cb1f0b7537fcb0848db2fca44b5211ffea1ae10c2c2aef7c399f72 +size 7123 diff --git a/src/client/app/desktop/views/components/ui.header.vue b/src/client/app/desktop/views/components/ui.header.vue index 1b96e0648..d38aebec8 100644 --- a/src/client/app/desktop/views/components/ui.header.vue +++ b/src/client/app/desktop/views/components/ui.header.vue @@ -10,7 +10,9 @@
-
+
+ +
@@ -129,13 +131,12 @@ export default Vue.extend({ display block width 48px height 48px - background-image var(--desktopHeaderIcon) - background-size 24px - background-position center - background-repeat no-repeat opacity 0.3 cursor pointer + > svg + fill currentColor + > .left, > .center left 0 diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 72aedbce9..c43de3024 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -136,7 +136,6 @@ "desktopHeaderBg": ":lighten<5<$secondary", "desktopHeaderFg": "$text", "desktopHeaderHoverFg": "#fff", - "desktopHeaderIcon": "url('/assets/desktop/header-icon.dark.svg')", "desktopHeaderSearchBg": "rgba(0, 0, 0, 0.1)", "desktopHeaderSearchHoverBg": "rgba(255, 255, 255, 0.04)", "desktopHeaderSearchFg": "#fff", diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 4690054cb..2e4f4b8cc 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -136,7 +136,6 @@ "desktopHeaderBg": ":lighten<5<$secondary", "desktopHeaderFg": "$text", "desktopHeaderHoverFg": "#7b8c88", - "desktopHeaderIcon": "url('/assets/desktop/header-icon.light.svg')", "desktopHeaderSearchBg": "rgba(0, 0, 0, 0.05)", "desktopHeaderSearchHoverBg": "rgba(0, 0, 0, 0.08)", "desktopHeaderSearchFg": "#000",