aboutsummaryrefslogtreecommitdiff
path: root/src/components/post_status_form
diff options
context:
space:
mode:
authoreugenijm <eugenijm@protonmail.com>2019-05-07 22:32:47 +0300
committereugenijm <eugenijm@protonmail.com>2019-05-08 16:50:39 +0300
commita89010843deb67f8c03e72ab8681b1de54b3259b (patch)
tree52a3995f3d89b4554834c180cc6cfd8580efc657 /src/components/post_status_form
parent4af343374af30d781dd6b7a5298928339f6a425d (diff)
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
Diffstat (limited to 'src/components/post_status_form')
-rw-r--r--src/components/post_status_form/post_status_form.js1
-rw-r--r--src/components/post_status_form/post_status_form.vue12
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>