Merge remote-tracking branch 'upstream/develop' into favorites

* upstream/develop:
  Add Korean translation
  Change emptlyTl to take userId
  better fix
  fixes #265 and also that thin line below gradient on chrome (UGH)
  fix #262 part of user profiles not being able to load previous posts
  Retain userId on clearing user timeline, don't flush when empty timeline

src/components/user_card_content/user_card_content.vue

@@ -142,7 +142,7 @@
   border-bottom-right-radius: 0;
 
   .panel-heading {
-    padding: .6em 0;
+    padding: .5em 0;
     text-align: center;
     box-shadow: none;
   }
@@ -226,10 +226,11 @@
     }
   }
 
-  .user-name{
+  .user-name {
     text-overflow: ellipsis;
     overflow: hidden;
-    flex: 1 0 auto;
+    flex: 1 1 auto;
+    margin-right: 1em;
   }
 
   .user-screen-name {
@@ -245,6 +246,10 @@
     .dailyAvg {
       min-width: 1px;
       flex: 0 0 auto;
+      margin-left: 1em;
+      font-size: 0.7em;
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
     }
 
     .handle {
@@ -381,11 +386,6 @@
   }
 }
 
-.dailyAvg {
-  margin-left: 1em;
-  font-size: 0.7em;
-  color: #CCC;
-}
 .floater {
 }
 </style>

src/components/user_profile/user_profile.js

@@ -27,7 +27,7 @@ const UserProfile = {
       return this.$route.params.id || this.user.id
     },
     userName () {
-      return this.$route.params.name
+      return this.$route.params.name || this.user.screen_name
     },
     friends () {
       return this.user.friends
@@ -74,7 +74,7 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.commit('clearTimeline', { timeline: 'user' })
-      this.$store.dispatch('startFetching', ['user', this.userName])
+      this.$store.dispatch('startFetching', ['user', this.fetchBy])
     },
     userId () {
       if (!this.isExternal) {
@@ -82,7 +82,7 @@ const UserProfile = {
       }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.commit('clearTimeline', { timeline: 'user' })
-      this.$store.dispatch('startFetching', ['user', this.userId])
+      this.$store.dispatch('startFetching', ['user', this.fetchBy])
     },
     user () {
       if (this.user.id && !this.user.followers) {

src/components/user_profile/user_profile.vue

@@ -3,7 +3,7 @@
   <div v-if="user.id" class="user-profile panel panel-default">
     <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
     <tab-switcher>
-      <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
+      <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="fetchBy"/>
       <div :label="$t('user_card.followees')">
         <div v-if="friends">
           <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card>