diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-09-28 12:10:15 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-09-28 12:10:15 +0900 |
| commit | 5df85b5febd86cd34bcc59737f4ae974689e2a0e (patch) | |
| tree | e9acbdd3a9459ff3d71cbe670cbed77bb0693ae0 /src/client | |
| parent | wip (diff) | |
| download | sharkey-5df85b5febd86cd34bcc59737f4ae974689e2a0e.tar.gz sharkey-5df85b5febd86cd34bcc59737f4ae974689e2a0e.tar.bz2 sharkey-5df85b5febd86cd34bcc59737f4ae974689e2a0e.zip | |
wip
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/poll-editor.vue | 12 | ||||
| -rw-r--r-- | src/client/theme/dark.json | 2 | ||||
| -rw-r--r-- | src/client/theme/light.json | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/client/app/common/views/components/poll-editor.vue b/src/client/app/common/views/components/poll-editor.vue index 7f52c62c23..b5c57d48a5 100644 --- a/src/client/app/common/views/components/poll-editor.vue +++ b/src/client/app/common/views/components/poll-editor.vue @@ -68,9 +68,7 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> - - -root(isDark) +.mk-poll-editor padding 8px > .caution @@ -104,7 +102,7 @@ root(isDark) width 300px font-size 14px color var(--inputText) - background isDark ? #191b22 : #fff + background var(--pollEditorInputBg) border solid 1px var(--primaryAlpha01) border-radius 4px @@ -142,10 +140,4 @@ root(isDark) &:active color var(--primaryDarken30) -.mk-poll-editor[data-darkmode] - root(true) - -.mk-poll-editor:not([data-darkmode]) - root(false) - </style> diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json index 3d3c9b37c7..8700d396a8 100644 --- a/src/client/theme/dark.json +++ b/src/client/theme/dark.json @@ -77,6 +77,8 @@ "reactionViewerBorder": "rgba(255, 255, 255, 0.1)", + "pollEditorInputBg": "rgba(0, 0, 0, 0.25)", + "urlPreviewBorder": "rgba(0, 0, 0, 0.4)", "urlPreviewBorderHover": "rgba(255, 255, 255, 0.2)", "urlPreviewTitle": "$text", diff --git a/src/client/theme/light.json b/src/client/theme/light.json index d4dd246542..d55b75ab08 100644 --- a/src/client/theme/light.json +++ b/src/client/theme/light.json @@ -77,6 +77,8 @@ "reactionViewerBorder": "rgba(0, 0, 0, 0.1)", + "pollEditorInputBg": "#fff", + "urlPreviewBorder": "rgba(0, 0, 0, 0.1)", "urlPreviewBorderHover": "rgba(0, 0, 0, 0.2)", "urlPreviewTitle": "$text", |