diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:57:16 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:57:16 +0000 |
| commit | c1ff17ebb0a96d715f8badd0061f78420154a498 (patch) | |
| tree | 09edbfe9eccd4d6fce16a9b498a3739e372465c3 /src/components/user_card_content/user_card_content.vue | |
| parent | b124dbf44e71a74a05b1994cc06480c63db2e290 (diff) | |
| parent | be27494ca15986af03087a2b74d9288bd95b3f51 (diff) | |
Merge branch 'clean-profile' into 'develop'
Make user profile page cleaner
Closes #225
See merge request pleroma/pleroma-fe!428
Diffstat (limited to 'src/components/user_card_content/user_card_content.vue')
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index a40aff35..085334b6 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -25,7 +25,7 @@ <div v-if="user.follows_you && loggedIn && isOtherUser" class="following"> {{ $t('user_card.follows_you') }} </div> - <div class="floater" v-if="switcher || isOtherUser"> + <div class="floater" v-if="isOtherUser && (loggedIn || !switcher)"> <!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to --> <input class="userHighlightText" type="text" :id="'userHighlightColorTx'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/> <input class="userHighlightCl" type="color" :id="'userHighlightColor'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/> @@ -67,7 +67,7 @@ </button> </span> </div> - <div class='mute' v-if='isOtherUser'> + <div class='mute' v-if='isOtherUser && loggedIn'> <span v-if='user.muted'> <button @click="toggleMute" class="pressed"> {{ $t('user_card.muted') }} |