pleroma-fe

commit: 2be3d5fd5f9ca9d0a782b3ce63c79b24cecda9a8
parent: fedcc716762339b72f6a99722f2c54a300fdff4f
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Wed, 15 May 2019 19:53:33 +0000

Merge branch 'fix/line-up-text-format-picker' into 'develop'

Line up rich text format picker with the status form

See merge request pleroma/pleroma-fe!785
Diffstat:
M
src/App.scss
1
-
M
src/components/post_status_form/post_status_form.vue
6
+++---

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -627,7 +627,6 @@ nav {
 
 .visibility-tray {
   font-size: 1.2em;
-  padding: 3px;
   cursor: pointer;
 
   .selected {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -58,7 +58,7 @@
       >
       </textarea>
       <div class="visibility-tray">
-        <span class="text-format" v-if="formattingOptionsEnabled">
+        <div 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 v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
@@ -67,7 +67,7 @@
             </select>
             <i class="icon-down-open"></i>
           </label>
-        </span>
+        </div>
 
         <scope-selector
           :showAll="showAllScopes"
@@ -250,7 +250,7 @@
   .form-group {
     display: flex;
     flex-direction: column;
-    padding: 0.3em 0.5em 0.6em;
+    padding: 0.25em 0.5em 0.5em;
     line-height:24px;
   }