From dcb7e1ecf479a72c904dd882c05f1c446dbe2fe4 Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Tue, 4 Sep 2018 00:32:25 +0100
Subject: Add option for disabling counts (followers, statuses) in user
 profiles.

---
 src/components/user_card_content/user_card_content.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/components/user_card_content/user_card_content.vue')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 59358040..65fd26eb 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -17,7 +17,7 @@
           <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
           <router-link class='user-screen-name':to="{ name: 'user-profile', params: { id: user.id } }">
             <span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
-            <span class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
+            <span v-if="!hideUserStatsLocal" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
           </router-link>
         </div>
       </div>
@@ -90,19 +90,19 @@
         </div>
       </div>
     </div>
-    <div class="panel-body profile-panel-body">
+    <div v-if="!hideUserStatsLocal || switcher" class="panel-body profile-panel-body">
       <div class="user-counts" :class="{clickable: switcher}">
         <div class="user-count" v-on:click.prevent="setProfileView('statuses')" :class="{selected: selected === 'statuses'}">
           <h5>{{ $t('user_card.statuses') }}</h5>
-          <span>{{user.statuses_count}} <br></span>
+          <span v-if="!hideUserStatsLocal">{{user.statuses_count}} <br></span>
         </div>
         <div class="user-count" v-on:click.prevent="setProfileView('friends')" :class="{selected: selected === 'friends'}">
           <h5>{{ $t('user_card.followees') }}</h5>
-          <span>{{user.friends_count}}</span>
+          <span v-if="!hideUserStatsLocal">{{user.friends_count}}</span>
         </div>
         <div class="user-count" v-on:click.prevent="setProfileView('followers')" :class="{selected: selected === 'followers'}">
           <h5>{{ $t('user_card.followers') }}</h5>
-          <span>{{user.followers_count}}</span>
+          <span v-if="!hideUserStatsLocal">{{user.followers_count}}</span>
         </div>
       </div>
       <p v-if="!hideBio && user.description_html" class="profile-bio" v-html="user.description_html"></p>
-- 
cgit v1.2.3-70-g09d2


From 5a59eb4efab1aa54000a229694a958e3e1274e8d Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Tue, 4 Sep 2018 01:10:22 +0100
Subject: Don't hide the bio.

---
 src/components/user_card_content/user_card_content.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/user_card_content/user_card_content.vue')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 65fd26eb..84669d7f 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -90,8 +90,8 @@
         </div>
       </div>
     </div>
-    <div v-if="!hideUserStatsLocal || switcher" class="panel-body profile-panel-body">
-      <div class="user-counts" :class="{clickable: switcher}">
+    <div class="panel-body profile-panel-body">
+      <div v-if="!hideUserStatsLocal || switcher" class="user-counts" :class="{clickable: switcher}">
         <div class="user-count" v-on:click.prevent="setProfileView('statuses')" :class="{selected: selected === 'statuses'}">
           <h5>{{ $t('user_card.statuses') }}</h5>
           <span v-if="!hideUserStatsLocal">{{user.statuses_count}} <br></span>
-- 
cgit v1.2.3-70-g09d2


From 8dc85b057e058a39f968fa188e0d77a5a9dd5ca6 Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Tue, 4 Sep 2018 01:18:55 +0100
Subject: Don't only include whitespace conditionally, to fix the fade.

---
 src/components/user_card_content/user_card_content.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components/user_card_content/user_card_content.vue')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 84669d7f..9ce3ca19 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -94,7 +94,7 @@
       <div v-if="!hideUserStatsLocal || switcher" class="user-counts" :class="{clickable: switcher}">
         <div class="user-count" v-on:click.prevent="setProfileView('statuses')" :class="{selected: selected === 'statuses'}">
           <h5>{{ $t('user_card.statuses') }}</h5>
-          <span v-if="!hideUserStatsLocal">{{user.statuses_count}} <br></span>
+          <span v-if="!hideUserStatsLocal">{{user.statuses_count}}</span>
         </div>
         <div class="user-count" v-on:click.prevent="setProfileView('friends')" :class="{selected: selected === 'friends'}">
           <h5>{{ $t('user_card.followees') }}</h5>
@@ -105,6 +105,7 @@
           <span v-if="!hideUserStatsLocal">{{user.followers_count}}</span>
         </div>
       </div>
+      <br>
       <p v-if="!hideBio && user.description_html" class="profile-bio" v-html="user.description_html"></p>
       <p v-else-if="!hideBio" class="profile-bio">{{ user.description }}</p>
     </div>
-- 
cgit v1.2.3-70-g09d2


From 145929207ef9204066b03ab104284168a054b5f0 Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Tue, 4 Sep 2018 02:00:12 +0100
Subject: Revert "Don't only include whitespace conditionally, to fix the
 fade."

This reverts commit 8dc85b057e058a39f968fa188e0d77a5a9dd5ca6.
---
 src/components/user_card_content/user_card_content.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/components/user_card_content/user_card_content.vue')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 9ce3ca19..84669d7f 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -94,7 +94,7 @@
       <div v-if="!hideUserStatsLocal || switcher" class="user-counts" :class="{clickable: switcher}">
         <div class="user-count" v-on:click.prevent="setProfileView('statuses')" :class="{selected: selected === 'statuses'}">
           <h5>{{ $t('user_card.statuses') }}</h5>
-          <span v-if="!hideUserStatsLocal">{{user.statuses_count}}</span>
+          <span v-if="!hideUserStatsLocal">{{user.statuses_count}} <br></span>
         </div>
         <div class="user-count" v-on:click.prevent="setProfileView('friends')" :class="{selected: selected === 'friends'}">
           <h5>{{ $t('user_card.followees') }}</h5>
@@ -105,7 +105,6 @@
           <span v-if="!hideUserStatsLocal">{{user.followers_count}}</span>
         </div>
       </div>
-      <br>
       <p v-if="!hideBio && user.description_html" class="profile-bio" v-html="user.description_html"></p>
       <p v-else-if="!hideBio" class="profile-bio">{{ user.description }}</p>
     </div>
-- 
cgit v1.2.3-70-g09d2

