From 38a6aa26bc3d8fb70215474a667ad06080660cea Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 27 Sep 2018 23:17:33 +0900
Subject: [PATCH] wip

---
 .../app/desktop/views/components/notes.note.vue    | 14 +++-----------
 .../app/desktop/views/pages/deck/deck.note.vue     |  4 ++--
 src/client/app/mobile/views/components/note.vue    |  4 ++--
 src/client/theme/dark.json                         |  2 ++
 src/client/theme/light.json                        |  2 ++
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 7e4f42533..b628d045a 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -317,9 +317,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-
-
-root(isDark)
+.note
 	margin 0
 	padding 0
 	background var(--face)
@@ -456,8 +454,8 @@ root(isDark)
 						>>> .quote
 							margin 8px
 							padding 6px 12px
-							color isDark ? #6f808e : #aaa
-							border-left solid 3px isDark ? #637182 : #eee
+							color var(--mfmQuote)
+							border-left solid 3px var(--mfmQuoteLine)
 
 						> .reply
 							margin-right 8px
@@ -529,12 +527,6 @@ root(isDark)
 		padding-top 4px
 		background rgba(#000, 0.0125)
 
-.note[data-darkmode]
-	root(true)
-
-.note:not([data-darkmode])
-	root(false)
-
 </style>
 
 <style lang="stylus" module>
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index 3bc4f2682..c6925d5ce 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -338,8 +338,8 @@ root(isDark)
 						>>> .quote
 							margin 8px
 							padding 6px 12px
-							color isDark ? #6f808e : #aaa
-							border-left solid 3px isDark ? #637182 : #eee
+							color var(--mfmQuote)
+							border-left solid 3px var(--mfmQuoteLine)
 
 						> .reply
 							margin-right 8px
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index b1c583569..8bb9f43fa 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -378,8 +378,8 @@ root(isDark)
 						>>> .quote
 							margin 8px
 							padding 6px 12px
-							color isDark ? #6f808e : #aaa
-							border-left solid 3px isDark ? #637182 : #eee
+							color var(--mfmQuote)
+							border-left solid 3px var(--mfmQuoteLine)
 
 						> .reply
 							margin-right 8px
diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 1eb41ea52..d79e348b0 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -92,6 +92,8 @@
 	"googleSearchHoverButton": "rgba(255, 255, 255, 0.1)",
 
 	"mfmTitleBg": "rgba(0, 0, 0, 0.2)",
+	"mfmQuote": ":alpha<0.7<$text",
+	"mfmQuoteLine": ":alpha<0.6<$text",
 
 	"messagingRoomBg": "@bg",
 	"messagingRoomInfo": "#fff",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index 556bd2450..7d15d49ae 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -92,6 +92,8 @@
 	"googleSearchHoverButton": "rgba(0, 0, 0, 0.05)",
 
 	"mfmTitleBg": "rgba(0, 0, 0, 0.07)",
+	"mfmQuote": ":alpha<0.6<$text",
+	"mfmQuoteLine": ":alpha<0.5<$text",
 
 	"messagingRoomBg": "#fff",
 	"messagingRoomInfo": "#000",