commit: 20b0ffc0b9978799ed34fc3b8c85aa8fe56f2eeb
parent: a8ae2a5b11a1afd5b1317e5b36130782864a4f10
Author: Shpuld Shpludson <shp@cock.li>
Date: Sat, 1 Sep 2018 05:57:58 +0000
Merge branch 'imvomitingasicodethisshit' into 'develop'
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
Diffstat:
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
@@ -139,6 +139,9 @@ const PostStatusForm = {
},
scopeOptionsEnabled () {
return this.$store.state.config.scopeOptionsEnabled
+ },
+ formattingOptionsEnabled () {
+ return this.$store.state.config.formattingOptionsEnabled
}
},
methods: {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -33,7 +33,7 @@
@paste="paste">
</textarea>
<div class="visibility-tray">
- <span class="text-format">
+ <span class="text-format" v-if="formattingOptionsEnabled">
<label for="post-content-type" class="select">
<select id="post-content-type" v-model="newStatus.contentType" class="form-control">
<option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -73,12 +73,14 @@
border-radius: var(--panelRadius, $fallback--panelRadius);
border-style: solid;
border-color: $fallback--border;
- border-color: var(--border, $fallback--border);
+ border-color: var(--border, $fallback--border);
border-width: 1px;
overflow: hidden;
.panel-heading {
background: transparent;
+ flex-direction: column;
+ align-items: stretch;
}
p {
diff --git a/src/main.js b/src/main.js
@@ -119,6 +119,7 @@ window.fetch('/api/statusnet/config.json')
var whoToFollowLink = (config.whoToFollowLink)
var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
var scopeOptionsEnabled = (config.scopeOptionsEnabled)
+ var formattingOptionsEnabled = (config.formattingOptionsEnabled)
var collapseMessageWithSubject = (config.collapseMessageWithSubject)
store.dispatch('setOption', { name: 'theme', value: theme })
@@ -131,6 +132,7 @@ window.fetch('/api/statusnet/config.json')
store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink })
store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
+ store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
if (chatDisabled) {
store.dispatch('disableChat')
diff --git a/static/config.json b/static/config.json
@@ -9,5 +9,6 @@
"chatDisabled": false,
"showInstanceSpecificPanel": false,
"scopeOptionsEnabled": false,
+ "formattingOptionsEnabled": false,
"collapseMessageWithSubject": false
}