Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

CONTRIBUTORS.md

@@ -6,3 +6,4 @@ Contributors of this project.
 - dtluna (dtluna@social.heldscal.la): Code
 - sonyam (sonyam@social.heldscal.la): Default background image
 - hakui (hakui@freezepeach.xyz): CSS and styling
+- shpuld (shpuld@shitposter.club): CSS and styling

README.md

@@ -2,6 +2,8 @@
 
 > A Qvitter-style frontend for certain GS servers.
 
+![screenshot](http://i.imgur.com/3q30Zxt.jpg)
+
 # FOR ADMINS
 
 You don't need to build Pleroma yourself. Check out https://gitgud.io/lambadalambda/pleroma-fe/wikis/dual-boot-with-qvitter to see how to run Pleroma and Qvitter at the same time.

src/components/user_card_content/user_card_content.vue

@@ -3,30 +3,34 @@
     <div class="base00-background panel-heading text-center" v-bind:style="style">
       <div class='user-info'>
         <img :src="user.profile_image_url">
-        <div v-if='user.muted' class='muteinfo'>Muted</div>
-        <div class='muteinfo' v-if='isOtherUser'>
-          <button @click="toggleMute">Mute/Unmute</button>
-        </div>
         <span class="glyphicon glyphicon-user"></span>
         <div class='user-name'>{{user.name}}</div>
         <div class='user-screen-name'>@{{user.screen_name}}</div>
-        <div v-if="isOtherUser" class="following-info">
+        <div v-if="isOtherUser" class="user-interactions">
-          <div v-if="user.follows_you" class="following">
+          <div v-if="user.follows_you" class="following base06">
             Follows you!
           </div>
-          <div class="followed">
+          <div class="follow">
             <span v-if="user.following">
-              Following them!
+              <!--Following them!-->
-              <button @click="unfollowUser">
+              <button @click="unfollowUser" class="base06 base01-background base06-border">
-                Unfollow!
+                Unfollow
               </button>
             </span>
-            <span v-if="!user.following" >
+            <span v-if="!user.following">
-              <button @click="followUser">
+              <button @click="followUser" class="base01 base04-background base01-border">
-                Follow!
+                Follow
               </button>
             </span>
           </div>
+          <div class='mute' v-if='isOtherUser'>
+            <span v-if='user.muted'>
+              <button @click="toggleMute" class="base04 base01-background base06-border">Unmute</button>
+            </span>
+            <span v-if='!user.muted'>
+              <button @click="toggleMute" class="base01 base04-background base01-border">Mute</button>
+            </span>
+          </div>
         </div>
       </div>
     </div>

src/components/user_profile/user_profile.vue

@@ -13,17 +13,35 @@
  }
 
  .user-info {
-     .following-info {
+     .user-interactions {
          display: flex;
+         flex-flow: row wrap;
 
          div {
              flex: 1;
          }
-         margin-top: 1em;
+         margin-top: 0.5em;
          margin-bottom: -1.2em;
-     }
+
-     .muteinfo{
+         .following {
-     	margin: 0.5em 0;
+             font-size: 14px;
+             flex: 0 0 100%;
+             margin-bottom: 0.5em;
+         }
+
+         .mute {
+             margin-right: 4em;
+         }
+
+         .follow {
+             margin-left: 4em;
+         }
+
+         button {
+             width: 80%;
+             height: 100%;
+             border: 1px solid;
+         }
      }
      .user-screen-name {
      	margin-top: 0.4em;