From 1eb6ad58d5699ec22b41265b4b8c687641015109 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 27 Sep 2018 02:46:53 +0900 Subject: [PATCH] wip --- src/client/app/desktop/views/components/note-detail.vue | 4 ++-- src/client/app/desktop/views/components/notes.note.vue | 4 ++-- src/client/app/desktop/views/pages/deck/deck.note.vue | 4 ++-- src/client/app/mobile/views/components/note-detail.vue | 4 ++-- src/client/app/mobile/views/components/note.vue | 4 ++-- src/client/theme/dark.json | 2 ++ src/client/theme/halloween.json | 2 ++ src/client/theme/light.json | 2 ++ 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 35eb6ac45..5e7c8b42c 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -263,8 +263,8 @@ root(isDark) border-bottom 1px solid isDark ? #1c2023 : #eef0f2 > .renote - color #9dbb00 - background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) + color var(--renoteText) + background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) > p margin 0 diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 4f2b0241e..17f7e2235 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -357,8 +357,8 @@ root(isDark) padding 16px 32px 8px 32px line-height 28px white-space pre - color #9dbb00 - background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) + color var(--renoteText) + background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) .avatar display inline-block 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 a02636a42..f1c4a5979 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -246,8 +246,8 @@ root(isDark) padding 8px 16px 0 16px line-height 28px white-space pre - color #9dbb00 - background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) + color var(--renoteText) + background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) .avatar flex-shrink 0 diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index f0a91e82d..c56d10093 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -266,8 +266,8 @@ root(isDark) border-bottom 1px solid isDark ? #1c2023 : #eef0f2 > .renote - color #9dbb00 - background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) + color var(--renoteText) + background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) > p margin 0 diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index a8b733fae..8b7c55999 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -256,8 +256,8 @@ root(isDark) padding 8px 16px line-height 28px white-space pre - color #9dbb00 - background isDark ? linear-gradient(to bottom, #314027 0%, #282c37 100%) : linear-gradient(to bottom, #edfde2 0%, #fff 100%) + color var(--renoteText) + background linear-gradient(to bottom, var(--renoteGradient) 0%, var(--face) 100%) @media (min-width 500px) padding 16px diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index b3d233d45..533910de7 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -14,6 +14,8 @@ "faceDivider": "rgba(0, 0, 0, 0.3)", "popupBg": "#2c303c", "popupFg": "#d6dce2", + "renoteGradient": "#314027", + "renoteText": "#9dbb00", "modalBackdrop": "rgba(0, 0, 0, 0.5)", "dateDividerBg": "#242731", "dateDividerFg": "#666b79", diff --git a/src/client/theme/halloween.json b/src/client/theme/halloween.json index d38bd849e..18d214d04 100644 --- a/src/client/theme/halloween.json +++ b/src/client/theme/halloween.json @@ -12,6 +12,8 @@ "faceDivider": "rgba(0, 0, 0, 0.3)", "popupBg": "#2c303c", "popupFg": "#d6dce2", + "renoteGradient": "#5d2d1a", + "renoteText": "#ff6c00", "reactionPickerButtonHoverBg": "rgba(0, 0, 0, 0.18)", "desktopHeaderBg": "#0c0b19" } diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 87f384a20..df85fb973 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -14,6 +14,8 @@ "faceDivider": "rgba(0, 0, 0, 0.082)", "popupBg": "#fff", "popupFg": "#586069", + "renoteGradient": "#edfde2", + "renoteText": "#9dbb00", "modalBackdrop": "rgba(0, 0, 0, 0.1)", "dateDividerBg": "#fdfdfd", "dateDividerFg": "#aaa",