diff options
Diffstat (limited to 'src/components/post_status_form')
| -rw-r--r-- | src/components/post_status_form/post_status_form.js | 1 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 998794bf..cbd2024a 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -341,7 +341,6 @@ const PostStatusForm = { }, changeVis (visibility) { this.newStatus.visibility = visibility - this.$emit('onScopeChange', visibility) }, dismissScopeNotice () { this.$store.dispatch('setOption', { name: 'hideScopeNotice', value: true }) diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 15a466ec..b8b93936 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -9,21 +9,21 @@ class="visibility-notice"> <router-link :to="{ name: 'user-settings' }">{{ $t('post_status.account_not_locked_warning_link') }}</router-link> </i18n> - <p v-if="!hideScopeNotice && newStatus.visibility === 'public'" class="visibility-notice"> + <p v-if="!hideScopeNotice && newStatus.visibility === 'public'" class="visibility-notice notice-dismissible"> <span>{{ $t('post_status.scope_notice.public') }}</span> - <a v-on:click.prevent="dismissScopeNotice()" style="float: right" class="button-icon"> + <a v-on:click.prevent="dismissScopeNotice()" class="button-icon dismiss"> <i class='icon-cancel'></i> </a> </p> - <p v-else-if="!hideScopeNotice && newStatus.visibility === 'unlisted'" class="visibility-notice"> + <p v-else-if="!hideScopeNotice && newStatus.visibility === 'unlisted'" class="visibility-notice notice-dismissible"> <span>{{ $t('post_status.scope_notice.unlisted') }}</span> - <a v-on:click.prevent="dismissScopeNotice()" style="float: right" class="button-icon"> + <a v-on:click.prevent="dismissScopeNotice()" class="button-icon dismiss"> <i class='icon-cancel'></i> </a> </p> - <p v-else-if="!hideScopeNotice && newStatus.visibility === 'private'" class="visibility-notice"> + <p v-else-if="!hideScopeNotice && newStatus.visibility === 'private' && $store.state.users.currentUser.locked" class="visibility-notice notice-dismissible"> <span>{{ $t('post_status.scope_notice.private') }}</span> - <a v-on:click.prevent="dismissScopeNotice()" style="float: right" class="button-icon"> + <a v-on:click.prevent="dismissScopeNotice()" class="button-icon dismiss"> <i class='icon-cancel'></i> </a> </p> |