From bfd530aaea75ab228d3ccc531de790cef2ddf332 Mon Sep 17 00:00:00 2001
From: wakarimasen <wakarimasen@airmail.cc>
Date: Thu, 9 Mar 2017 18:20:16 +0100
Subject: Let timeline component fetch mentions

---
 src/components/mentions/mentions.js | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/components')

diff --git a/src/components/mentions/mentions.js b/src/components/mentions/mentions.js
index 46a1c63e..841d5aa4 100644
--- a/src/components/mentions/mentions.js
+++ b/src/components/mentions/mentions.js
@@ -2,25 +2,12 @@ import Timeline from '../timeline/timeline.vue'
 
 const Mentions = {
   computed: {
-    username () {
-      return this.$route.params.username
-    },
     timeline () {
       return this.$store.state.statuses.timelines.mentions
     }
   },
   components: {
     Timeline
-  },
-  created () {
-    this.$store.state.api.backendInteractor.fetchMentions({username: this.username})
-      .then((mentions) => {
-        this.$store.dispatch('addNewStatuses', {
-          statuses: mentions,
-          timeline: 'mentions',
-          showImmediately: true
-        })
-      })
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From bd7a05dee11fd4482a9f72829b758f009e4bd67e Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Thu, 9 Mar 2017 19:57:20 +0200
Subject: Fix red border not appearing on the last notification.

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

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 37ae67ef..5cce7a73 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -73,7 +73,8 @@
     }
 
     &:last-child {
-      border: none
+      border-bottom: none;
+      border-radius: 0 0 10px 10px;
     }
   }
 
-- 
cgit v1.2.3-70-g09d2


From df4dad18044bd7948ae31c2d7167bd8caec83bfb Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Thu, 9 Mar 2017 21:32:54 +0200
Subject: Separate reply form from inside status to make it resistant to
 hilighting, make the reply button light up when reply window is open.

---
 src/components/status/status.vue | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9b0827a7..eceb0a75 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -73,18 +73,21 @@
             <div class='status-actions'>
               <div>
                 <a href="#" v-on:click.prevent="toggleReplying">
-                  <i class='fa icon-reply'></i>
+                  <i class="fa icon-reply icon-reply-active" v-if="replying"></i>
+                  <i class="fa icon-reply" v-else></i>
                 </a>
               </div>
               <retweet-button :status=status></retweet-button>
               <favorite-button :status=status></favorite-button>
               <delete-button :status=status></delete-button>
             </div>
-
-            <post-status-form v-if="replying" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying"></post-status-form>
           </div>
         </div>
       </div>
+      <div class="status base00-background container" v-if="replying">
+        <div class="reply-left"/>
+        <post-status-form class="reply-body" :reply-to="status.id" :attentions="status.attentions" :repliedUser="status.user" v-on:posted="toggleReplying"/>
+      </div>
     </template>
   </div>
 </template>
@@ -141,6 +144,10 @@
      color: $blue;
  }
 
+ .icon-reply-active {
+     color: $blue;
+ }
+
  .status .avatar {
      width: 48px;
  }
@@ -172,4 +179,14 @@
    margin-bottom: 1em;
    margin-top: 0.2em;
  }
+
+ .reply-left {
+   flex: 0;
+   min-width: 48px;
+ }
+
+ .reply-body {
+   flex: 1;
+ }
+
 </style>
-- 
cgit v1.2.3-70-g09d2


From 3bb5f86d0d804881bbe9b7b1e16d8eb551e5f2b3 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Fri, 10 Mar 2017 00:49:22 +0200
Subject: Use conditional class for reply icon color.

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

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index eceb0a75..c180262e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -73,8 +73,7 @@
             <div class='status-actions'>
               <div>
                 <a href="#" v-on:click.prevent="toggleReplying">
-                  <i class="fa icon-reply icon-reply-active" v-if="replying"></i>
-                  <i class="fa icon-reply" v-else></i>
+                  <i class="fa icon-reply" :class="{'icon-reply-active': replying}"></i>
                 </a>
               </div>
               <retweet-button :status=status></retweet-button>
-- 
cgit v1.2.3-70-g09d2