summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-20 13:38:28 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-20 13:38:28 +0900
commit8ccfbbf24c32cfc05bed669e3f97061e79c42fd0 (patch)
tree8bfa9e4e626aa1f0ef870cbe866314b7c7399be4 /src
parent:v: (diff)
downloadsharkey-8ccfbbf24c32cfc05bed669e3f97061e79c42fd0.tar.gz
sharkey-8ccfbbf24c32cfc05bed669e3f97061e79c42fd0.tar.bz2
sharkey-8ccfbbf24c32cfc05bed669e3f97061e79c42fd0.zip
Darken
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/poll.vue13
-rw-r--r--src/client/app/desktop/views/components/user-preview.vue2
-rw-r--r--src/client/app/desktop/views/widgets/polls.vue2
3 files changed, 13 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/poll.vue b/src/client/app/common/views/components/poll.vue
index 1834d4ddc2..de4373f561 100644
--- a/src/client/app/common/views/components/poll.vue
+++ b/src/client/app/common/views/components/poll.vue
@@ -68,7 +68,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
@import '~const.styl'
-.mk-poll
+root(isDark)
> ul
display block
@@ -81,7 +81,8 @@ export default Vue.extend({
margin 4px 0
padding 4px 8px
width 100%
- border solid 1px #eee
+ color isDark ? #fff : #000
+ border solid 1px isDark ? #5e636f : #eee
border-radius 4px
overflow hidden
cursor pointer
@@ -108,6 +109,8 @@ export default Vue.extend({
margin-left 4px
> p
+ color isDark ? #a3aebf : #000
+
a
color inherit
@@ -121,4 +124,10 @@ export default Vue.extend({
&:active
background transparent
+.mk-poll[data-darkmode]
+ root(true)
+
+.mk-poll:not([data-darkmode])
+ root(false)
+
</style>
diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue
index b34e81ed46..2e1870800f 100644
--- a/src/client/app/desktop/views/components/user-preview.vue
+++ b/src/client/app/desktop/views/components/user-preview.vue
@@ -141,7 +141,7 @@ root(isDark)
> .description
padding 0 16px
font-size 0.7em
- color #555
+ color isDark ? #9ea4ad : #555
> .status
padding 8px 16px
diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue
index 42b9c5f25f..852bf2e3a1 100644
--- a/src/client/app/desktop/views/widgets/polls.vue
+++ b/src/client/app/desktop/views/widgets/polls.vue
@@ -67,7 +67,7 @@ root(isDark)
> .poll
padding 16px
font-size 12px
- color #555
+ color isDark ? #9ea4ad : #555
> p
margin 0 0 8px 0