commit: d0281f5341a6fa97983beca158c051ddca66d6a1
parent: 35fc1fa7bd5b566fe5a1219380a1d18d018c3562
Author: Roger Braun <roger@rogerbraun.net>
Date: Sat, 18 Feb 2017 20:44:33 +0100
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop
Diffstat:
4 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -5,4 +5,5 @@ Contributors of this project.
- wakarimasen (wakarimasen@shitposter.club): NSFW hiding image
- dtluna (dtluna@social.heldscal.la): Code
- sonyam (sonyam@social.heldscal.la): Default background image
-- hakui (hakui@freezepeach.xyz): CSS and styling-
\ No newline at end of file
+- hakui (hakui@freezepeach.xyz): CSS and styling
+- shpuld (shpuld@shitposter.club): CSS and styling+
\ No newline at end of file
diff --git a/README.md b/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.
diff --git 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
@@ -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{
- margin: 0.5em 0;
+
+ .following {
+ 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;