From 17f30190e0781f526f7fcacd8422f1c472b7dc79 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 31 Aug 2018 17:00:41 +0300
Subject: [PATCH 1/2] Made showing format selection optional and default to
 false

---
 src/components/post_status_form/post_status_form.js  | 3 +++
 src/components/post_status_form/post_status_form.vue | 2 +-
 src/main.js                                          | 2 ++
 static/config.json                                   | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 7d2735c5f0..d7f1ffb23b 100644
--- 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
index 543ab52798..559ad01696 100644
--- 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/main.js b/src/main.js
index 72806d10e4..debd87038e 100644
--- 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
index ccc4aebd8c..144fe951c2 100644
--- a/static/config.json
+++ b/static/config.json
@@ -9,5 +9,6 @@
   "chatDisabled": false,
   "showInstanceSpecificPanel": false,
   "scopeOptionsEnabled": false,
+  "formattingOptionsEnabled": false,
   "collapseMessageWithSubject": false
 }

From d6240c25cf975e743511623563193dea1dc9cc53 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 31 Aug 2018 17:24:46 +0300
Subject: [PATCH 2/2] small fix

---
 src/components/user_card/user_card.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 7e3e0afecb..48f272cac4 100644
--- 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 {