From 76097416802a8afcd09bc69994c6632ce0f73902 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 28 Sep 2018 12:13:08 +0900
Subject: [PATCH] wip

---
 .../app/desktop/views/components/note-preview.vue      |  2 +-
 .../app/desktop/views/components/notes.note.sub.vue    |  2 +-
 .../app/desktop/views/pages/deck/deck.note.sub.vue     |  2 +-
 .../app/mobile/views/components/note-preview.vue       |  2 +-
 src/client/app/mobile/views/components/note.sub.vue    | 10 ++--------
 src/client/theme/dark.json                             |  1 +
 src/client/theme/light.json                            |  1 +
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/client/app/desktop/views/components/note-preview.vue b/src/client/app/desktop/views/components/note-preview.vue
index f64657fb47..7e5a1db8d4 100644
--- a/src/client/app/desktop/views/components/note-preview.vue
+++ b/src/client/app/desktop/views/components/note-preview.vue
@@ -81,7 +81,7 @@ root(isDark)
 					cursor default
 					margin 0
 					padding 0
-					color isDark ? #959ba7 : #717171
+					color var(--subNoteText)
 
 .qiziqtywpuaucsgarwajitwaakggnisj[data-darkmode]
 	root(true)
diff --git a/src/client/app/desktop/views/components/notes.note.sub.vue b/src/client/app/desktop/views/components/notes.note.sub.vue
index 70709f8738..a0c4cc2fad 100644
--- a/src/client/app/desktop/views/components/notes.note.sub.vue
+++ b/src/client/app/desktop/views/components/notes.note.sub.vue
@@ -82,7 +82,7 @@ root(isDark)
 					cursor default
 					margin 0
 					padding 0
-					color isDark ? #959ba7 : #717171
+					color var(--subNoteText)
 
 					pre
 						max-height 120px
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.sub.vue b/src/client/app/desktop/views/pages/deck/deck.note.sub.vue
index f1bf60d528..0b6a13beaf 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.sub.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.sub.vue
@@ -62,7 +62,7 @@ root(isDark)
 			> .text
 				margin 0
 				padding 0
-				color isDark ? #959ba7 : #717171
+				color var(--subNoteText)
 
 				pre
 					max-height 120px
diff --git a/src/client/app/mobile/views/components/note-preview.vue b/src/client/app/mobile/views/components/note-preview.vue
index 0b3278ff41..1c73779251 100644
--- a/src/client/app/mobile/views/components/note-preview.vue
+++ b/src/client/app/mobile/views/components/note-preview.vue
@@ -98,7 +98,7 @@ root(isDark)
 					cursor default
 					margin 0
 					padding 0
-					color isDark ? #959ba7 : #717171
+					color var(--subNoteText)
 
 .yohlumlkhizgfkvvscwfcrcggkotpvry[data-darkmode]
 	root(true)
diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue
index 8c2e3b496d..24f5be160c 100644
--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@@ -41,7 +41,7 @@ export default Vue.extend({
 </script>
 
 <style lang="stylus" scoped>
-root(isDark)
+.zlrxdaqttccpwhpaagdmkawtzklsccam
 	display flex
 	padding 16px
 	font-size 10px
@@ -104,16 +104,10 @@ root(isDark)
 				> .text
 					margin 0
 					padding 0
-					color isDark ? #959ba7 : #717171
+					color var(--subNoteText)
 
 					pre
 						max-height 120px
 						font-size 80%
 
-.zlrxdaqttccpwhpaagdmkawtzklsccam[data-darkmode]
-	root(true)
-
-.zlrxdaqttccpwhpaagdmkawtzklsccam:not([data-darkmode])
-	root(false)
-
 </style>
diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 8700d396a8..b4c9fd5606 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -34,6 +34,7 @@
 	"popupFg": "#d6dce2",
 
 	"subNoteBg": "rgba(0, 0, 0, 0.18)",
+	"subNoteText": ":alpha<0.7<$text",
 	"renoteGradient": "#314027",
 	"renoteText": "#9dbb00",
 	"quoteBorder": "#4e945e",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index d55b75ab08..6aec07e74d 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -34,6 +34,7 @@
 	"popupFg": "#586069",
 
 	"subNoteBg": "rgba(0, 0, 0, 0.01)",
+	"subNoteText": ":alpha<0.7<$text",
 	"renoteGradient": "#edfde2",
 	"renoteText": "#9dbb00",
 	"quoteBorder": "#c0dac6",