moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
HJ 2019-05-15 19:53:33 +00:00
parent fedcc71676 81278651d9
commit 2be3d5fd5f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/App.scss
View File

@ -627,7 +627,6 @@ nav {
.visibility-tray { .visibility-tray {
font-size: 1.2em; font-size: 1.2em;
padding: 3px;
cursor: pointer; cursor: pointer;
.selected { .selected {

6
src/components/post_status_form/post_status_form.vue
View File

@ -58,7 +58,7 @@
> >
</textarea> </textarea>
<div class="visibility-tray"> <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"> <label for="post-content-type" class="select">
<select id="post-content-type" v-model="newStatus.contentType" class="form-control"> <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
<option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat"> <option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
@ -67,7 +67,7 @@
</select> </select>
<i class="icon-down-open"></i> <i class="icon-down-open"></i>
</label> </label>
</span> </div>
<scope-selector <scope-selector
:showAll="showAllScopes" :showAll="showAllScopes"
@ -250,7 +250,7 @@
.form-group { .form-group {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0.3em 0.5em 0.6em; padding: 0.25em 0.5em 0.5em;
line-height:24px; line-height:24px;
} }