From 775d7c36f65a479d6b1a5bacdac7e1bafdcc8c08 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 29 Nov 2019 01:18:33 +0900
Subject: [PATCH] Fix styles and add message when there are no statuses

---
 src/lang/en.js              |  3 +-
 src/views/status/Status.vue | 96 +++++++++++++++++++------------------
 src/views/users/index.vue   |  3 --
 src/views/users/show.vue    | 12 +++--
 4 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 40fd758d..13c30906 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -245,7 +245,8 @@ export default {
     roles: 'Roles',
     activeUppercase: 'Active',
     active: 'active',
-    deactivated: 'deactivated'
+    deactivated: 'deactivated',
+    noStatuses: 'No statuses to show'
   },
   usersFilter: {
     inputPlaceholder: 'Select filter',
diff --git a/src/views/status/Status.vue b/src/views/status/Status.vue
index b33744b1..60fbb610 100644
--- a/src/views/status/Status.vue
+++ b/src/views/status/Status.vue
@@ -185,54 +185,56 @@ export default {
 </script>
 
 <style rel='stylesheet/scss' lang='scss'>
-.account {
-  text-decoration: underline;
-  line-height: 26px;
-  font-size: 13px;
-}
-.image {
-  width: 20%;
-  img {
-    width: 100%;
-  }
-}
-.show-more-button {
-  margin-left: 5px;
-}
-.status-account {
-  display: flex;
-  align-items: center;
-}
-.status-avatar-img {
-  width: 15px;
-  height: 15px;
-  margin-right: 5px;
-}
-.status-account-name {
-  margin: 0;
-  height: 22px;
-}
-.status-body {
-  display: flex;
-  flex-direction: column;
-}
-.status-content {
-  font-size: 15px;
-  line-height: 26px;
-}
 .status-card {
-  margin-bottom: 15px;
-}
-.status-deleted {
-  font-style: italic;
-  margin-top: 3px;
-}
-.status-header {
-  display: flex;
-  justify-content: space-between;
-}
-.status-without-content {
-  font-style: italic;
+  .account {
+    text-decoration: underline;
+    line-height: 26px;
+    font-size: 13px;
+  }
+  .image {
+    width: 20%;
+    img {
+      width: 100%;
+    }
+  }
+  .show-more-button {
+    margin-left: 5px;
+  }
+  .status-account {
+    display: flex;
+    align-items: center;
+  }
+  .status-avatar-img {
+    width: 15px;
+    height: 15px;
+    margin-right: 5px;
+  }
+  .status-account-name {
+    margin: 0;
+    height: 22px;
+  }
+  .status-body {
+    display: flex;
+    flex-direction: column;
+  }
+  .status-content {
+    font-size: 15px;
+    line-height: 26px;
+  }
+  .status-card {
+    margin-bottom: 15px;
+  }
+  .status-deleted {
+    font-style: italic;
+    margin-top: 3px;
+  }
+  .status-header {
+    display: flex;
+    justify-content: space-between;
+  }
+  .status-without-content {
+    font-style: italic;
+  }
 }
 @media
 only screen and (max-width: 760px),
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 4e67ee70..f9b5e10f 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -156,9 +156,6 @@
         </p>
       </div>
     </el-dialog>
-    <div v-if="users.length === 0" class="no-users-message">
-      <p>There are no users to display</p>
-    </div>
     <div v-if="!loading" class="pagination">
       <el-pagination
         :total="usersCount"
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index de0415a5..6f563472 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -61,7 +61,7 @@
         </el-card>
       </el-col>
       <el-row type="flex" class="row-bg" justify="space-between">
-        <el-col :span="16">
+        <el-col :span="18">
           <h2 class="recent-statuses">{{ $t('userProfile.recentStatuses') }}</h2>
         </el-col>
         <el-col :span="6" class="show-private">
@@ -70,11 +70,12 @@
           </el-checkbox>
         </el-col>
       </el-row>
-      <el-col :span="18">
+      <el-col :span="16">
         <el-timeline v-if="!statusesLoading" class="statuses">
           <el-timeline-item v-for="status in statuses" :key="status.id">
             <status :status="status" :user-id="user.id" :godmode="showPrivate"/>
           </el-timeline-item>
+          <p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
         </el-timeline>
       </el-col>
     </el-row>
@@ -147,6 +148,11 @@ table {
     width: 100%;
   }
 }
+.no-statuses {
+  margin-left: 28px;
+  color: #606266;
+
+}
 .recent-statuses-header {
   margin-top: 10px;
 }
@@ -159,7 +165,7 @@ table {
   padding-right: 20px;
 }
 .recent-statuses {
-  margin-left: 40px;
+  margin-left: 28px;
 }
 .user-profile-card {
   margin-left: 15px;