summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-28 10:27:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-28 10:27:43 +0900
commitc85c825bad2f9e2f9cec290718beaac3b1c926dd (patch)
tree61e651c32611beaeafae4e2f159ba8deaed4764e /src/client
parent1.2.0 (diff)
downloadmisskey-c85c825bad2f9e2f9cec290718beaac3b1c926dd.tar.gz
misskey-c85c825bad2f9e2f9cec290718beaac3b1c926dd.tar.bz2
misskey-c85c825bad2f9e2f9cec290718beaac3b1c926dd.zip
:art:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/notes.note.sub.vue3
-rw-r--r--src/client/app/desktop/views/components/notes.note.vue7
-rw-r--r--src/client/app/mobile/views/components/note-preview.vue1
-rw-r--r--src/client/app/mobile/views/components/note.sub.vue3
-rw-r--r--src/client/app/mobile/views/components/note.vue12
-rw-r--r--src/client/app/mobile/views/components/notes.vue1
6 files changed, 5 insertions, 22 deletions
diff --git a/src/client/app/desktop/views/components/notes.note.sub.vue b/src/client/app/desktop/views/components/notes.note.sub.vue
index c3136b64f5..3e1b75c29f 100644
--- a/src/client/app/desktop/views/components/notes.note.sub.vue
+++ b/src/client/app/desktop/views/components/notes.note.sub.vue
@@ -35,8 +35,9 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
margin 0
- padding 16px
+ padding 16px 32px
font-size 0.9em
+ background isDark ? #21242d : #fcfcfc
&:after
content ""
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 9e7a7a6d29..217587ec6d 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -371,13 +371,6 @@ root(isDark)
& + article
padding-top 8px
- > .reply-to
- padding 0 16px
- background rgba(0, 0, 0, 0.0125)
-
- > .mk-note-preview
- background transparent
-
> article
padding 28px 32px 18px 32px
diff --git a/src/client/app/mobile/views/components/note-preview.vue b/src/client/app/mobile/views/components/note-preview.vue
index b9a6db315d..1de739d5d2 100644
--- a/src/client/app/mobile/views/components/note-preview.vue
+++ b/src/client/app/mobile/views/components/note-preview.vue
@@ -31,7 +31,6 @@ export default Vue.extend({
margin 0
padding 0
font-size 0.9em
- background #fff
&:after
content ""
diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue
index 38659143ac..8e3835ac23 100644
--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@@ -28,8 +28,9 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
- font-size 0.9em
padding 16px
+ font-size 0.9em
+ background isDark ? #21242d : #fcfcfc
@media (min-width 600px)
padding 24px 32px
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index e7a43f7985..3eca49a43f 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -240,12 +240,6 @@ root(isDark)
font-size 12px
border-bottom solid 1px isDark ? #1c2023 : #eaeaea
- &:first-child
- border-radius 8px 8px 0 0
-
- > .renote
- border-radius 8px 8px 0 0
-
&:last-of-type
border-bottom none
@@ -304,12 +298,6 @@ root(isDark)
& + article
padding-top 8px
- > .reply-to
- background rgba(0, 0, 0, 0.0125)
-
- > .mk-note-preview
- background transparent
-
> article
padding 16px 16px 9px
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 58069b06ee..d2b530e2e2 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -200,6 +200,7 @@ export default Vue.extend({
@import '~const.styl'
root(isDark)
+ overflow hidden
background isDark ? #282C37 : #fff
border-radius 8px
box-shadow 0 0 2px rgba(#000, 0.1)