-
- (%i18n:@private%)
- (%i18n:@deleted%)
-
-
-
-
-
-
-
-
%fa:map-marker-alt% %i18n:@location%
-
-
-
+
+ {{ p.cw }}
+ {{ showContent ? '%i18n:@hide%' : '%i18n:@see-more%' }}
+
+
+
+ (%i18n:@private%)
+ (%i18n:@deleted%)
+
+
+
+
+
+
+
+
%fa:map-marker-alt% %i18n:@location%
+
+
+
+
@@ -104,6 +110,7 @@ export default Vue.extend({
data() {
return {
+ showContent: false,
conversation: [],
conversationFetching: false,
replies: []
@@ -334,44 +341,70 @@ root(isDark)
> .body
padding 8px 0
- > .text
+ > .cw
+ cursor default
display block
margin 0
padding 0
overflow-wrap break-word
- font-size 16px
color isDark ? #fff : #717171
- @media (min-width 500px)
- font-size 24px
+ > .text
+ margin-right 8px
- > .renote
- margin 8px 0
+ > .toggle
+ display inline-block
+ padding 4px 8px
+ font-size 0.7em
+ color isDark ? #393f4f : #fff
+ background isDark ? #687390 : #b1b9c1
+ border-radius 2px
+ cursor pointer
+ user-select none
- > .mk-note-preview
- padding 16px
- border dashed 1px #c0dac6
- border-radius 8px
+ &:hover
+ background isDark ? #707b97 : #bbc4ce
- > .location
- margin 4px 0
- font-size 12px
- color #ccc
+ > .content
- > .map
- width 100%
- height 200px
-
- &:empty
- display none
-
- > .mk-url-preview
- margin-top 8px
-
- > .files
- > img
+ > .text
display block
- max-width 100%
+ margin 0
+ padding 0
+ overflow-wrap break-word
+ font-size 16px
+ color isDark ? #fff : #717171
+
+ @media (min-width 500px)
+ font-size 24px
+
+ > .renote
+ margin 8px 0
+
+ > *
+ padding 16px
+ border dashed 1px #c0dac6
+ border-radius 8px
+
+ > .location
+ margin 4px 0
+ font-size 12px
+ color #ccc
+
+ > .map
+ width 100%
+ height 200px
+
+ &:empty
+ display none
+
+ > .mk-url-preview
+ margin-top 8px
+
+ > .files
+ > img
+ display block
+ max-width 100%
> .time
font-size 16px
diff --git a/src/client/app/mobile/views/components/note-preview.vue b/src/client/app/mobile/views/components/note-preview.vue
index 5d56d2d32..a85434407 100644
--- a/src/client/app/mobile/views/components/note-preview.vue
+++ b/src/client/app/mobile/views/components/note-preview.vue
@@ -1,10 +1,16 @@
-
+
-
+
+ {{ note.cw }}
+ {{ showContent ? '%i18n:@hide%' : '%i18n:@see-more%' }}
+
+
+
+
@@ -14,7 +20,18 @@
import Vue from 'vue';
export default Vue.extend({
- props: ['note']
+ props: {
+ note: {
+ type: Object,
+ required: true
+ }
+ },
+
+ data() {
+ return {
+ showContent: false
+ };
+ }
});
@@ -65,16 +82,41 @@ root(isDark)
> .body
- > .text
+ > .cw
cursor default
+ display block
margin 0
padding 0
- color isDark ? #959ba7 : #717171
+ overflow-wrap break-word
+ color isDark ? #fff : #717171
-.mk-note-preview[data-darkmode]
+ > .text
+ margin-right 8px
+
+ > .toggle
+ display inline-block
+ padding 4px 8px
+ font-size 0.7em
+ color isDark ? #393f4f : #fff
+ background isDark ? #687390 : #b1b9c1
+ border-radius 2px
+ cursor pointer
+ user-select none
+
+ &:hover
+ background isDark ? #707b97 : #bbc4ce
+
+ > .content
+ > .text
+ cursor default
+ margin 0
+ padding 0
+ color isDark ? #959ba7 : #717171
+
+.yohlumlkhizgfkvvscwfcrcggkotpvry[data-darkmode]
root(true)
-.mk-note-preview:not([data-darkmode])
+.yohlumlkhizgfkvvscwfcrcggkotpvry:not([data-darkmode])
root(false)
diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue
index a68aec40a..77527a149 100644
--- a/src/client/app/mobile/views/components/note.sub.vue
+++ b/src/client/app/mobile/views/components/note.sub.vue
@@ -1,10 +1,16 @@
-
+
-
+
+ {{ note.cw }}
+ {{ showContent ? '%i18n:@hide%' : '%i18n:@see-more%' }}
+
+
+
+
@@ -24,6 +30,12 @@ export default Vue.extend({
type: Boolean,
default: true
}
+ },
+
+ data() {
+ return {
+ showContent: false
+ };
}
});
@@ -77,20 +89,44 @@ root(isDark)
margin-bottom 2px
> .body
-
- > .text
+ > .cw
+ cursor default
+ display block
margin 0
padding 0
- color isDark ? #959ba7 : #717171
+ overflow-wrap break-word
+ color isDark ? #fff : #717171
- pre
- max-height 120px
- font-size 80%
+ > .text
+ margin-right 8px
-.sub[data-darkmode]
+ > .toggle
+ display inline-block
+ padding 4px 8px
+ font-size 0.7em
+ color isDark ? #393f4f : #fff
+ background isDark ? #687390 : #b1b9c1
+ border-radius 2px
+ cursor pointer
+ user-select none
+
+ &:hover
+ background isDark ? #707b97 : #bbc4ce
+
+ > .content
+ > .text
+ margin 0
+ padding 0
+ color isDark ? #959ba7 : #717171
+
+ pre
+ max-height 120px
+ font-size 80%
+
+.zlrxdaqttccpwhpaagdmkawtzklsccam[data-darkmode]
root(true)
-.sub:not([data-darkmode])
+.zlrxdaqttccpwhpaagdmkawtzklsccam:not([data-darkmode])
root(false)
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index 907e72898..c608451e5 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -35,9 +35,7 @@
%fa:map-marker-alt% %i18n:@location%
-
-
-
+
via {{ p.app.name }}
@@ -436,7 +434,7 @@ root(isDark)
> .renote
margin 8px 0
- > .mk-note-preview
+ > *
padding 16px
border dashed 1px isDark ? #4e945e : #c0dac6
border-radius 8px
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 212451a5b..e53ba48ff 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -10,8 +10,8 @@