Merge branch 'cssOverhaul' into 'develop'

Transition to CSS-variables for themes and stuff.

See merge request pleroma/pleroma-fe!217

1 files changed, 47 insertions, 43 deletions

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index dd14d1b4..51d6965f 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="card base00-background">
+  <div class="card">
     <a href="#">
       <img @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url">
     </a>
@@ -7,7 +7,7 @@
       <user-card-content :user="user" :switcher="false"></user-card-content>
     </div>
     <div class="name-and-screen-name" v-else>
-      <div class="user-name">
+      <div :title="user.name" class="user-name">
         {{ user.name }}
         <span class="follows-you" v-if="!userExpanded && showFollows && user.follows_you">
             {{ $t('user_card.follows_you') }}
@@ -21,54 +21,58 @@
 <script src="./user_card.js"></script>
 
 <style lang="scss">
-  .name-and-screen-name {
-    margin-left: 0.7em;
-    margin-top:0.0em;
-    margin-right: 2em;
-    text-align: left;
-    width: 100%;
-  }
+@import '../../_variables.scss';
 
-  .follows-you {
-    margin-left: 2em;
-    float: right;
-  }
+.name-and-screen-name {
+  margin-left: 0.7em;
+  margin-top:0.0em;
+  text-align: left;
+  width: 100%;
+}
 
-  .follows {
+.follows-you {
+  margin-left: 2em;
+  float: right;
+}
 
-  }
+.card {
+  display: flex;
+  flex: 1 0;
+  padding-top: 0.6em;
+  padding-right: 1em;
+  padding-bottom: 0.6em;
+  padding-left: 1em;
+  border-bottom: 1px solid;
+  margin: 0;
+  border-bottom-color: $fallback--border;
+	border-bottom-color: var(--border, $fallback--border);
 
-  .card {
-    display: flex;
-    flex: 1 0;
-    padding-top: 0.6em;
-    padding-right: 1em;
-    padding-bottom: 0.6em;
-    padding-left: 1em;
-    border-bottom: 1px solid;
-    margin: 0;
-    border-bottom-color: inherit;
+  .avatar {
+    margin-top: 0.2em;
+    width:32px;
+    height: 32px;
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+}
 
+.usercard {
+  width: fill-available;
+  margin: 0.2em 0 0.7em 0;
+  border-radius: $fallback--panelRadius;
+  border-radius: var(--panelRadius, $fallback--panelRadius);
+  border-style: solid;
+  border-color: $fallback--border;
+	border-color: var(--border, $fallback--border);
+  border-width: 1px;
+  overflow: hidden;
 
-    .avatar {
-      margin-top: 0.2em;
-      width:32px;
-      height: 32px;
-      border-radius: 50%;
-    }
+  .panel-heading {
+    background: transparent;
   }
 
-  .usercard {
-    width: fill-available;
-    margin: 0.2em 0 0.7em 0;
-    border-radius: 10px;
-    border-style: solid;
-    border-color: inherit;
-    border-width: 1px;
-    overflow: hidden;
-
-    p {
-      margin-bottom: 0;
-    }
+  p {
+    margin-bottom: 0;
   }
+}
 </style>