From 47a197eee0c38b855a00a4778ad22c458e237755 Mon Sep 17 00:00:00 2001 From: syuilo 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 f64657fb4..7e5a1db8d 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 70709f873..a0c4cc2fa 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 f1bf60d52..0b6a13bea 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 0b3278ff4..1c7377925 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 8c2e3b496..24f5be160 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({ diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 8700d396a..b4c9fd560 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 d55b75ab0..6aec07e74 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",