summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-21 10:10:04 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-21 10:10:04 +0900
commit4bf85a0e6b1260c1fffa89f734bd59ec995a0ac4 (patch)
tree5b4c6d3f13b652389cc12773650c22c6fde1373f /src
parentv5051 (diff)
downloadsharkey-4bf85a0e6b1260c1fffa89f734bd59ec995a0ac4.tar.gz
sharkey-4bf85a0e6b1260c1fffa89f734bd59ec995a0ac4.tar.bz2
sharkey-4bf85a0e6b1260c1fffa89f734bd59ec995a0ac4.zip
Darken
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/poll-editor.vue10
-rw-r--r--src/client/app/desktop/views/components/home.vue15
-rw-r--r--src/client/app/desktop/views/components/post-form.vue2
3 files changed, 21 insertions, 6 deletions
diff --git a/src/client/app/common/views/components/poll-editor.vue b/src/client/app/common/views/components/poll-editor.vue
index 189172679b..95bcba996e 100644
--- a/src/client/app/common/views/components/poll-editor.vue
+++ b/src/client/app/common/views/components/poll-editor.vue
@@ -69,7 +69,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
@import '~const.styl'
-.mk-poll-editor
+root(isDark)
padding 8px
> .caution
@@ -102,6 +102,8 @@ export default Vue.extend({
padding 6px 8px
width 300px
font-size 14px
+ color isDark ? #fff : #000
+ background isDark ? #191b22 : #fff
border solid 1px rgba($theme-color, 0.1)
border-radius 4px
@@ -139,4 +141,10 @@ export default Vue.extend({
&:active
color darken($theme-color, 30%)
+.mk-poll-editor[data-darkmode]
+ root(true)
+
+.mk-poll-editor:not([data-darkmode])
+ root(false)
+
</style>
diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue
index 90e9d1b785..5c5b462176 100644
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -219,7 +219,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
@import '~const.styl'
-.mk-home
+root(isDark)
display block
&[data-customize]
@@ -249,7 +249,8 @@ export default Vue.extend({
left 0
width 100%
height 48px
- background #f7f7f7
+ color isDark ? #fff : #000
+ background isDark ? #313543 : #f7f7f7
box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
> a
@@ -289,7 +290,7 @@ export default Vue.extend({
line-height 48px
&.trash
- border-left solid 1px #ddd
+ border-left solid 1px isDark ? #1c2023 : #ddd
> div
width 100%
@@ -329,7 +330,7 @@ export default Vue.extend({
.mk-post-form
margin-bottom 16px
- border solid 1px #e5e5e5
+ border solid 1px rgba(#000, 0.075)
border-radius 4px
> *:not(.main)
@@ -357,4 +358,10 @@ export default Vue.extend({
max-width 700px
margin 0 auto
+.mk-home[data-darkmode]
+ root(true)
+
+.mk-home:not([data-darkmode])
+ root(false)
+
</style>
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index eb6a40fe46..fee63916a5 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -392,7 +392,7 @@ root(isDark)
cursor pointer
> .mk-poll-editor
- background lighten($theme-color, 98%)
+ background isDark ? #181b23 : lighten($theme-color, 98%)
border solid 1px rgba($theme-color, 0.1)
border-top none
border-radius 0 0 4px 4px