pleroma-fe

commit: 8778270381c6f2fffdf1c6a5eb09448a787aebd7
parent: 2bc261afbaf9377450999e49a5fe46dcbcc8b180
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date:   Wed, 23 Aug 2017 13:41:24 -0400

Merge branch 'fix/style-fixes-user-profile' into 'develop'

Style fixes in user profile

See merge request !107
Diffstat:
M
src/components/timeline/timeline.vue
8
--------
M
src/components/user_card/user_card.vue
30
++++++++++++++++++------------
M
src/components/user_profile/user_profile.vue
2
++

3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -89,14 +89,6 @@
     }
   }
 
-  .avatar {
-  padding-top: 0.3em;
-  width:32px;
-  height: 32px;
-  border-radius: 50%;
-  }
-
-
   .new-status-notification {
     position:relative;
     margin-top: -1px;
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -7,14 +7,14 @@
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
     <div class="name-and-screen-name" v-else>
-      <div class="user-name">{{ user.name }}</div>
-      <a href="user.statusnet_profile_url"><div class="user-screen-name">@{{ user.screen_name }}</div></a>
-    </div>
-    <span class="follows-you" v-if="!userExpanded && showFollows">
-      <div class="follows" v-if="user.follows_you">
-        Follows you!
+      <div class="user-name">
+        {{ user.name }}
+        <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
+            Follows you!
+        </span>
       </div>
-    </span>
+      <a :href="user.statusnet_profile_url" target="blank"><div class="user-screen-name">@{{ user.screen_name }}</div></a>
+    </div>
   </div>
 </template>
 
@@ -23,21 +23,19 @@
 <style lang="scss">
   .name-and-screen-name {
     margin-left: 0.7em;
-    min-width: 16em;
-    display:block;
     margin-top:0.0em;
     margin-right: 2em;
     text-align: left;
+    width: 100%;
   }
 
   .follows-you {
     margin-left: 2em;
-    width:-webkit-fill-available;
-    width: -moz-webkit-fill-available;
+    float: right;
   }
 
   .follows {
-    float: right;
+
   }
 
   .card {
@@ -50,6 +48,14 @@
     border-bottom: 1px solid;
     margin: 0;
     border-bottom-color: inherit;
+
+
+    .avatar {
+      margin-top: 0.2em;
+      width:32px;
+      height: 32px;
+      border-radius: 50%;
+    }
   }
 
   .usercard {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
@@ -14,6 +14,8 @@
 .user-profile {
   flex: 2;
   flex-basis: 500px;
+  padding-bottom: 10px;
+  border-radius: 10px;
 }
 
 </style>