From e0d3fd17ce5df8ac7e2adc5c4434cd8b050e5a86 Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Fri, 28 Sep 2018 16:13:47 +0900 Subject: [PATCH] wio --- src/client/app/desktop/views/components/drive.vue | 15 +++------------ src/client/theme/dark.json | 1 + src/client/theme/light.json | 1 + 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue index a1748963aa..f9b7eea64e 100644 --- a/src/client/app/desktop/views/components/drive.vue +++ b/src/client/app/desktop/views/components/drive.vue @@ -585,17 +585,14 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> - - -root(isDark) - +.mk-drive > nav display block z-index 2 width 100% overflow auto font-size 0.9em - color isDark ? #d2d9dc : #555 + color var(--text) background var(--face) box-shadow 0 1px 0 rgba(#000, 0.05) @@ -674,7 +671,7 @@ root(isDark) padding 8px height calc(100% - 38px) overflow auto - background isDark ? #191b22 : #fff + background var(--desktopDriveBg) &, * user-select none @@ -780,10 +777,4 @@ root(isDark) > input display none -.mk-drive[data-darkmode] - root(true) - -.mk-drive:not([data-darkmode]) - root(false) - </style> diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index ee5e1fb42c..151001350d 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -140,6 +140,7 @@ "desktopTimelineSrc": "@faceTextButton", "desktopTimelineSrcHover": "@faceTextButtonHover", "desktopWindowTitle": "@faceHeaderText", + "desktopDriveBg": "@bg", "desktopSettingsNavItem": ":alpha<0.8<$text", "desktopSettingsNavItemHover": ":lighten<10<$text", diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 4cfba2c1f6..0f26f8b165 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -140,6 +140,7 @@ "desktopTimelineSrc": "#6f7477", "desktopTimelineSrcHover": "#525a5f", "desktopWindowTitle": "#666", + "desktopDriveBg": "#fff", "desktopSettingsNavItem": ":alpha<0.8<$text", "desktopSettingsNavItemHover": ":darken<10<$text", -- GitLab