From fe2e5ba6f04e9fd32aa62f4889c752cd2bb7eede Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Thu, 1 Feb 2018 17:18:51 +0200
Subject: Align custom emoji to middle of line

---
 src/components/status/status.vue | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index d6c8cdb3..d5c904a2 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -248,6 +248,7 @@
          img, video {
            max-width: 100%;
            max-height: 400px;
+           vertical-align: middle;
            object-fit: contain;
          }
 
-- 
cgit v1.2.3-70-g09d2


From 664a55fc792bbaf5e3b474a610fee53febaa7ebd Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Fri, 2 Feb 2018 00:45:29 +0200
Subject: Show fav/RT counts even if not logged in.

---
 src/components/favorite_button/favorite_button.js  |  2 +-
 src/components/favorite_button/favorite_button.vue | 10 +++++++---
 src/components/retweet_button/retweet_button.js    |  2 +-
 src/components/retweet_button/retweet_button.vue   | 10 +++++++---
 src/components/status/status.vue                   | 18 ++++++++----------
 5 files changed, 24 insertions(+), 18 deletions(-)

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

diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js
index 466e9b84..1266be90 100644
--- a/src/components/favorite_button/favorite_button.js
+++ b/src/components/favorite_button/favorite_button.js
@@ -1,5 +1,5 @@
 const FavoriteButton = {
-  props: ['status'],
+  props: ['status', 'loggedIn'],
   data () {
     return {
       animated: false
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index dcf28e35..65d368c7 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <i :class='classes' class='favorite-button base09' @click.prevent='favorite()'/>
+  <div v-if="loggedIn">
+    <i :class='classes' class='favorite-button fav-active base09' @click.prevent='favorite()'/>
+    <span v-if='status.fave_num > 0'>{{status.fave_num}}</span>
+  </div>
+  <div v-else>
+    <i :class='classes' class='favorite-button base09'/>
     <span v-if='status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
 </template>
@@ -8,7 +12,7 @@
 <script src="./favorite_button.js" ></script>
 
 <style lang='scss'>
-  .favorite-button {
+  .fav-active {
       cursor: pointer;
       animation-duration: 0.6s;
       &:hover {
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 2280f315..4a43542d 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -1,5 +1,5 @@
 const RetweetButton = {
-  props: ['status'],
+  props: ['status', 'loggedIn'],
   data () {
     return {
       animated: false
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index edbfef32..7a7ea763 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <i :class='classes' class='icon-retweet base09' v-on:click.prevent='retweet()'></i>
+  <div v-if="loggedIn">
+    <i :class='classes' class='icon-retweet rt-active base09' v-on:click.prevent='retweet()'></i>
+    <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
+  </div>
+  <div v-else>
+    <i :class='classes' class='icon-retweet base09'></i>
     <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
 </template>
@@ -9,7 +13,7 @@
 
 <style lang='scss'>
   @import '../../_variables.scss';
-  .icon-retweet {
+  .rt-active {
      cursor: pointer;
      animation-duration: 0.6s;
      &:hover {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index d6c8cdb3..5c1f6804 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -105,17 +105,15 @@
             </div>
           </div>
 
-          <div v-if="loggedIn">
-            <div class='status-actions'>
-              <div>
-                <a href="#" v-on:click.prevent="toggleReplying">
-                  <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
-                </a>
-              </div>
-              <retweet-button :status=status></retweet-button>
-              <favorite-button :status=status></favorite-button>
-              <delete-button :status=status></delete-button>
+          <div class='status-actions'>
+            <div v-if="loggedIn">
+              <a href="#" v-on:click.prevent="toggleReplying">
+                <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
+              </a>
             </div>
+            <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
+            <favorite-button :loggedIn="loggedIn" :status=status></favorite-button>
+            <delete-button :status=status></delete-button>
           </div>
         </div>
       </div>
-- 
cgit v1.2.3-70-g09d2


From f3f0155d60eeb191fa22208bc9e5aeeda67bf24a Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Fri, 2 Feb 2018 12:27:31 +0200
Subject: Fix fav/RT buttons in notifications.

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

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 3a8d164d..fed2fb78 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -8,8 +8,8 @@
             <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
           </a>
         </div>
-        <retweet-button :status=status></retweet-button>
-        <favorite-button :status=status></favorite-button>
+        <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
+        <favorite-button :loggedIn="loggedin" :status=status></favorite-button>
       </div>
     </div>
     <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying" v-if="replying"/>
-- 
cgit v1.2.3-70-g09d2


From 06265078d8ff2e94fd7679e641a49b46fd437da7 Mon Sep 17 00:00:00 2001
From: shp <shp@cock.li>
Date: Sat, 3 Feb 2018 10:18:53 +0200
Subject: Fix typo in fav/rt fix

---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index fed2fb78..f6afaa25 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -9,7 +9,7 @@
           </a>
         </div>
         <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
-        <favorite-button :loggedIn="loggedin" :status=status></favorite-button>
+        <favorite-button :loggedIn="loggedIn" :status=status></favorite-button>
       </div>
     </div>
     <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying" v-if="replying"/>
-- 
cgit v1.2.3-70-g09d2