therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'fixes-and-tweaks'

Browse source 
# Conflicts:
#   src/i18n/messages.js
This commit is contained in:
kaniini 2018-08-19 23:59:15 +00:00
commit 702dfcec10
6 changed files with 83 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/post_status_form/post_status_form.js
View file

@ -54,7 +54,7 @@ const PostStatusForm = {
newStatus: {
status: statusText,
files: [],
visibility: this.messageScope || 'public'
visibility: this.messageScope || this.$store.state.users.currentUser.default_scope
},
caret: 0
}

19
src/components/post_status_form/post_status_form.vue
View file

@ -101,25 +101,6 @@
}
}
.post-status-form .visibility-tray {
font-size: 1.2em;
padding: 3px;
cursor: pointer;
.selected {
color: $fallback--lightFg;
color: var(--lightFg, $fallback--lightFg);
}
}
.visibility-notice {
padding: .5em;
border: 1px solid $fallback--faint;
border: 1px solid var(--faint, $fallback--faint);
border-radius: $fallback--inputRadius;
border-radius: var(--inputRadius, $fallback--inputRadius);
}
.post-status-form, .login {
.form-bottom {
display: flex;