From 734597b43f0376c8df1f64c54f9fec592ffea51f Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 01:48:35 -0600
Subject: hello world

---
 src/components/user_profile/user_profile.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fe9fd3a9..962318e4 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -19,6 +19,14 @@
          div {
              flex: 1;
          }
+         margin-top: 1em;
+         margin-bottom: -1.2em;
+     }
+     .muteinfo{
+     	margin: 0.5em 0;
+     }
+     .user-screen-name {
+     	margin-top: 0.4em;
      }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From e86b1d71ee325a47fdcc10ffe1912e81fe7de9b5 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 15:48:27 +0200
Subject: Changed following-info to user-interactions and moved muting there,
 made everything in user-interactions look a bit neater

---
 .../user_card_content/user_card_content.vue        | 30 ++++++++++++----------
 src/components/user_profile/user_profile.vue       | 26 ++++++++++++++++---
 2 files changed, 39 insertions(+), 17 deletions(-)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 2c32406b..0ee1d86f 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/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="user.follows_you" class="following">
+        <div v-if="isOtherUser" class="user-interactions">
+          <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!
-              <button @click="unfollowUser">
-                Unfollow!
+              <!--Following them!-->
+              <button @click="unfollowUser" class="base06 base01-background base06-border">
+                Unfollow
               </button>
             </span>
-            <span v-if="!user.following" >
-              <button @click="followUser">
-                Follow!
+            <span v-if="!user.following">
+              <button @click="followUser" class="base01 base04-background base01-border">
+                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>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 962318e4..7bed9ee0 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -13,20 +13,38 @@
  }
 
  .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;
+
+         .following {
+            font-size: 14px;
+            flex: 0 0 100%;
+            margin-bottom: 0.5em;
+         }
      }
-     .muteinfo{
-     	margin: 0.5em 0;
+
+     .mute {
+     	margin-right: 4em;
+     }
+
+     .follow {
+        margin-left: 4em;
      }
      .user-screen-name {
      	margin-top: 0.4em;
      }
+
+     button {
+         width: 80%;
+         height: 100%;
+         border: 1px solid;
+     }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 15c82dea62120b097e35f1443748c5996141a730 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 15:49:27 +0200
Subject: moved around classes in the user-info css

---
 src/components/user_profile/user_profile.vue | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 7bed9ee0..08221ac8 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -24,27 +24,27 @@
          margin-bottom: -1.2em;
 
          .following {
-            font-size: 14px;
-            flex: 0 0 100%;
-            margin-bottom: 0.5em;
+             font-size: 14px;
+             flex: 0 0 100%;
+             margin-bottom: 0.5em;
          }
-     }
 
-     .mute {
-     	margin-right: 4em;
-     }
+         .mute {
+             margin-right: 4em;
+         }
+
+         .follow {
+             margin-left: 4em;
+         }
 
-     .follow {
-        margin-left: 4em;
+         button {
+             width: 80%;
+             height: 100%;
+             border: 1px solid;
+         }
      }
      .user-screen-name {
      	margin-top: 0.4em;
      }
-
-     button {
-         width: 80%;
-         height: 100%;
-         border: 1px solid;
-     }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 8a0197d68224e816b3e569c36ed3dfd931088386 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 19:58:16 +0200
Subject: Fix follow/mute buttons from getting squished on mobile

---
 src/components/user_profile/user_profile.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 08221ac8..b0d6db85 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -16,6 +16,7 @@
      .user-interactions {
          display: flex;
          flex-flow: row wrap;
+         justify-content: center;
 
          div {
              flex: 1;
@@ -30,11 +31,11 @@
          }
 
          .mute {
-             margin-right: 4em;
+             max-width: 200px;
          }
 
          .follow {
-             margin-left: 4em;
+             max-width: 200px;
          }
 
          button {
-- 
cgit v1.2.3-70-g09d2