From 436773837b5f121168a7d23ce3e3b817ededc12a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 28 Sep 2018 11:23:30 +0900
Subject: [PATCH] wip
---
.../app/mobile/views/components/ui.nav.vue | 16 ++++------------
src/client/theme/dark.json | 2 ++
src/client/theme/light.json | 2 ++
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue
index a84dc7349a..ba122cc3e2 100644
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@@ -121,10 +121,8 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
-
-
-root(isDark)
- $color = isDark ? #c9d2e0 : #777
+.nav
+ $color = var(--text)
.backdrop
position fixed
@@ -133,7 +131,7 @@ root(isDark)
z-index 1025
width 100%
height 100%
- background isDark ? rgba(#000, 0.7) : rgba(#000, 0.2)
+ background var(--mobileNavBackdrop)
.body
position fixed
@@ -144,7 +142,7 @@ root(isDark)
height 100%
overflow auto
-webkit-overflow-scrolling touch
- background isDark ? #16191f : #fff
+ background var(--secondary)
.me
display block
@@ -265,10 +263,4 @@ root(isDark)
opacity: 0;
}
-.nav[data-darkmode]
- root(true)
-
-.nav:not([data-darkmode])
- root(false)
-
</style>
diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 896ac7a920..f5294f27cd 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -12,6 +12,7 @@
"primary": "$primary",
"primaryForeground": "#fff",
+ "secondary": "$secondary",
"bg": ":darken<8<$secondary",
"text": "$text",
@@ -127,6 +128,7 @@
"desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":lighten<10<$text",
+ "mobileNavBackdrop": "rgba(0, 0, 0, 0.7)",
"mobileUserPageName": "#fff",
"mobileUserPageAcct": "$text",
"mobileUserPageDescription": "$text",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index fe018b5476..4776b2f3b3 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -12,6 +12,7 @@
"primary": "$primary",
"primaryForeground": "#fff",
+ "secondary": "$secondary",
"bg": ":darken<8<$secondary",
"text": "$text",
@@ -127,6 +128,7 @@
"desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":darken<10<$text",
+ "mobileNavBackdrop": "rgba(0, 0, 0, 0.2)",
"mobileUserPageName": "#757c82",
"mobileUserPageAcct": "#969ea5",
"mobileUserPageDescription": "#757c82",