aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings/settings.vue
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2019-04-22 17:24:35 +0300
committershpuld <shp@cock.li>2019-04-22 17:24:35 +0300
commitd4179454277c10a3e2fda9f62b61a18151693d17 (patch)
tree57adbec33bbe9e30e0463579807c097a18b2d56f /src/components/settings/settings.vue
parent75a650aa6de13eaf1e0e17d5ec7bfffeee0db212 (diff)
parentc8f967d5c0424c7dd504ad4afeaefb7c745eed31 (diff)
Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users
Diffstat (limited to 'src/components/settings/settings.vue')
-rw-r--r--src/components/settings/settings.vue5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 6ee103c7..6890220f 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -42,9 +42,7 @@
</li>
<li>
<input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
- <label for="collapseMessageWithSubject">
- {{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}
- </label>
+ <label for="collapseMessageWithSubject">{{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}</label>
</li>
<li>
<input type="checkbox" id="streaming" v-model="streamingLocal">
@@ -330,6 +328,7 @@
textarea {
width: 100%;
+ max-width: 100%;
height: 100px;
}