From 32942709bfdb799f1ac26a087ffd4d73b558fcb5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 27 Sep 2018 23:09:23 +0900 Subject: [PATCH] wip --- src/client/app/desktop/views/components/note-detail.vue | 2 +- src/client/app/desktop/views/components/notes.note.vue | 8 ++++---- .../app/desktop/views/components/sub-note-content.vue | 2 +- src/client/app/desktop/views/pages/deck/deck.note.vue | 6 +++--- src/client/app/mobile/views/components/note-detail.vue | 2 +- src/client/app/mobile/views/components/note.vue | 6 +++--- .../app/mobile/views/components/sub-note-content.vue | 2 +- src/client/theme/dark.json | 2 ++ src/client/theme/halloween.json | 1 + src/client/theme/light.json | 2 ++ 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index 50ad793f0b..0c4b560e98 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -365,7 +365,7 @@ export default Vue.extend({ > * padding 16px - border dashed 1px vat(--quoteBorder) + border dashed 1px var(--quoteBorder) border-radius 8px > .location diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 5daaadb971..7e4f42533f 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -447,7 +447,7 @@ root(isDark) padding 4px font-size 90% text-align center - background isDark ? #2f3944 : #eef1f3 + background var(--mfmTitleBg) border-radius 4px >>> .code @@ -461,12 +461,12 @@ root(isDark) > .reply margin-right 8px - color isDark ? #99abbf : #717171 + color var(--text) > .rp margin-left 4px font-style oblique - color #a0bf46 + color var(--renoteText) > .location margin 4px 0 @@ -491,7 +491,7 @@ root(isDark) > * padding 16px - border dashed 1px vat(--quoteBorder) + border dashed 1px var(--quoteBorder) border-radius 8px > footer diff --git a/src/client/app/desktop/views/components/sub-note-content.vue b/src/client/app/desktop/views/components/sub-note-content.vue index 6889dc231e..fd8e658056 100644 --- a/src/client/app/desktop/views/components/sub-note-content.vue +++ b/src/client/app/desktop/views/components/sub-note-content.vue @@ -38,7 +38,7 @@ export default Vue.extend({ > .rp margin-left 4px font-style oblique - color #a0bf46 + color var(--renoteText) mk-poll font-size 80% 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 bdc4368e7b..3bc4f26823 100644 --- a/src/client/app/desktop/views/pages/deck/deck.note.vue +++ b/src/client/app/desktop/views/pages/deck/deck.note.vue @@ -329,7 +329,7 @@ root(isDark) padding 4px font-size 90% text-align center - background isDark ? #2f3944 : #eef1f3 + background var(--mfmTitleBg) border-radius 4px >>> .code @@ -348,7 +348,7 @@ root(isDark) > .rp margin-left 4px font-style oblique - color #a0bf46 + color var(--renoteText) [data-is-me]:after content "you" @@ -387,7 +387,7 @@ root(isDark) > * padding 16px - border dashed 1px vat(--quoteBorder) + border dashed 1px var(--quoteBorder) border-radius 8px > .app diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index ade518b1fc..48d6d32868 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -368,7 +368,7 @@ export default Vue.extend({ > * padding 16px - border dashed 1px vat(--quoteBorder) + border dashed 1px var(--quoteBorder) border-radius 8px > .location diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index ed175b4f6f..b1c5835692 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -369,7 +369,7 @@ root(isDark) padding 4px font-size 90% text-align center - background isDark ? #2f3944 : #eef1f3 + background var(--mfmTitleBg) border-radius 4px >>> .code @@ -388,7 +388,7 @@ root(isDark) > .rp margin-left 4px font-style oblique - color #a0bf46 + color var(--renoteText) [data-is-me]:after content "you" @@ -427,7 +427,7 @@ root(isDark) > * padding 16px - border dashed 1px vat(--quoteBorder) + border dashed 1px var(--quoteBorder) border-radius 8px > .app diff --git a/src/client/app/mobile/views/components/sub-note-content.vue b/src/client/app/mobile/views/components/sub-note-content.vue index 4d0aa25f34..2238edf278 100644 --- a/src/client/app/mobile/views/components/sub-note-content.vue +++ b/src/client/app/mobile/views/components/sub-note-content.vue @@ -37,7 +37,7 @@ export default Vue.extend({ > .rp margin-left 4px font-style oblique - color #a0bf46 + color var(--renoteText) mk-poll font-size 80% diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 39828e364e..1eb41ea52e 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -91,6 +91,8 @@ "googleSearchHoverBorder": "rgba(255, 255, 255, 0.3)", "googleSearchHoverButton": "rgba(255, 255, 255, 0.1)", + "mfmTitleBg": "rgba(0, 0, 0, 0.2)", + "messagingRoomBg": "@bg", "messagingRoomInfo": "#fff", "messagingRoomDateDividerLine": "rgba(255, 255, 255, 0.1)", diff --git a/src/client/theme/halloween.json b/src/client/theme/halloween.json index 1fc60c00ad..1bd00357e2 100644 --- a/src/client/theme/halloween.json +++ b/src/client/theme/halloween.json @@ -14,5 +14,6 @@ "renoteGradient": "#5d2d1a", "renoteText": "#ff6c00", + "quoteBorder": "#c3631c", "desktopHeaderBg": "#36314e" } diff --git a/src/client/theme/light.json b/src/client/theme/light.json index 2c45a57705..556bd24506 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -91,6 +91,8 @@ "googleSearchHoverBorder": "rgba(0, 0, 0, 0.3)", "googleSearchHoverButton": "rgba(0, 0, 0, 0.05)", + "mfmTitleBg": "rgba(0, 0, 0, 0.07)", + "messagingRoomBg": "#fff", "messagingRoomInfo": "#000", "messagingRoomDateDividerLine": "rgba(0, 0, 0, 0.1)",