diff options
| author | Xiaofeng An <futureweb2020@yandex.com> | 2019-02-06 04:37:00 -0500 |
|---|---|---|
| committer | Xiaofeng An <futureweb2020@yandex.com> | 2019-02-06 04:37:00 -0500 |
| commit | e4c0bbddd912c8df50883f5d222a8aff510a2c59 (patch) | |
| tree | 63394e6f53d75548084529c097bcff982dd5d47c /src/components | |
| parent | d2436fb9e5f8f512914033a2df33c57545d277a6 (diff) | |
| parent | 2d333f99e8d36c56e62db3e13428610df0b3874c (diff) | |
Merge branch 'develop' into fix/create-a-login-hint-on-mobile
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/about/about.js | 3 | ||||
| -rw-r--r-- | src/components/about/about.vue | 2 | ||||
| -rw-r--r-- | src/components/user_card/user_card.vue | 4 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/components/about/about.js b/src/components/about/about.js index b4433b4e..b1ce3c7d 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -7,6 +7,9 @@ const About = { InstanceSpecificPanel, FeaturesPanel, TermsOfServicePanel + }, + computed: { + showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } } } diff --git a/src/components/about/about.vue b/src/components/about/about.vue index bf87e0b8..13dec87c 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,7 +1,7 @@ <template> <div class="sidebar"> <instance-specific-panel></instance-specific-panel> - <features-panel></features-panel> + <features-panel v-if="showFeaturesPanel"></features-panel> <terms-of-service-panel></terms-of-service-panel> </div> </template> diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 35b27319..7129430b 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -1,8 +1,8 @@ <template> <div class="card"> - <a href="#"> + <router-link :to="userProfileLink(user)"> <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/> - </a> + </router-link> <div class="usercard" v-if="userExpanded"> <user-card-content :user="user" :switcher="false"></user-card-content> </div> diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index be42cc4a..d0743ef0 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -33,7 +33,7 @@ <input type="checkbox" v-model="newHideNetwork" id="account-hide-network"> <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label> </p> - <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> + <button :disabled='newName && newName.length === 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> </div> <div class="setting-item"> <h2>{{$t('settings.avatar')}}</h2> |