diff options
| author | Edijs <iamedijs@hotmail.com> | 2019-02-10 11:59:19 -0700 |
|---|---|---|
| committer | Edijs <iamedijs@hotmail.com> | 2019-02-10 11:59:19 -0700 |
| commit | fc26f1852ebc686ec34a7b65a3c7ad9f36ef630b (patch) | |
| tree | fafab5ab9b434b4af0f70cc53dc980446b463e1c /src/components/user_settings/user_settings.vue | |
| parent | d39e2643f523e84cdce1945538149a9bd6419fd6 (diff) | |
| parent | 4bea3c525f377a45919893ae0a474859b5744820 (diff) | |
Merge branch 'develop' into fix/hashtag-opening
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index d0743ef0..134f70ef 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -30,8 +30,17 @@ <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label> </p> <p> - <input type="checkbox" v-model="newHideNetwork" id="account-hide-network"> - <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label> + <input type="checkbox" v-model="hideFollows" id="account-hide-follows"> + <label for="account-hide-follows">{{$t('settings.hide_follows_description')}}</label> + </p> + <p> + <input type="checkbox" v-model="hideFollowers" id="account-hide-followers"> + <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label> + </p> + <p> + <input type="checkbox" v-model="showRole" id="account-show-role"> + <label for="account-show-role" v-if="role === 'admin'">{{$t('settings.show_admin_badge')}}</label> + <label for="account-show-role" v-if="role === 'moderator'">{{$t('settings.show_moderator_badge')}}</label> </p> <button :disabled='newName && newName.length === 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> </div> @@ -180,5 +189,9 @@ .name-changer { width: 100%; } + + .bg { + max-width: 100%; + } } </style> |