aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/post_status_form/post_status_form.js1
-rw-r--r--src/components/user_card_content/user_card_content.vue30
2 files changed, 18 insertions, 13 deletions
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3313ec3f..af5b81d4 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -87,6 +87,7 @@ const PostStatusForm = {
this.caret = selectionStart
},
postStatus (newStatus) {
+ if (this.posting) { return }
this.posting = true
statusPoster.postStatus({
status: newStatus.status,
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 175ae03d..236a0139 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -2,15 +2,19 @@
<div id="heading" class="profile-panel-background" :style="headingStyle">
<div class="panel-heading text-center">
<div class='user-info'>
- <router-link to='/user-settings' style="float: right;">
+ <router-link to='/user-settings' style="float: right;" v-if="!isOtherUser">
<i class="icon-cog usersettings"></i>
</router-link>
<div class='container'>
- <img :src="user.profile_image_url_original">
+ <router-link :to="{ name: 'user-profile', params: { id: user.id } }">
+ <img :src="user.profile_image_url_original">
+ </router-link>
<span class="glyphicon glyphicon-user"></span>
<div class="name-and-screen-name">
<div class='user-name'>{{user.name}}</div>
- <div class='user-screen-name'>@{{user.screen_name}}</div>
+ <router-link :to="{ name: 'user-profile', params: { id: user.id } }">
+ <div class='user-screen-name'>@{{user.screen_name}}</div>
+ </router-link>
</div>
</div>
<div v-if="isOtherUser" class="user-interactions">
@@ -132,7 +136,7 @@
.user-info {
color: white;
- padding: 16px 16px 16px 16px;
+ padding: 0 16px 16px 16px;
margin-bottom: -4em;
.usersettings {
@@ -141,21 +145,22 @@
}
.container{
+ padding: 16px 10px 4px 10px;
display: flex;
flex-wrap: wrap;
flex-direction: column;
align-content: flex-start;
justify-content: center;
- max-height: 60px;
+ max-height: 56px;
overflow: hidden;
}
img {
- border: 2px solid;
border-radius: 5px;
flex: 1 0 100%;
- width: 48px;
- height: 48px;
+ width: 56px;
+ height: 56px;
+ box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
object-fit: cover;
}
@@ -163,7 +168,6 @@
.name-and-screen-name {
display: block;
- margin-top: 0.0em;
margin-left: 0.6em;
text-align: left;
text-overflow: ellipsis;
@@ -171,9 +175,11 @@
}
.user-name{
+ color: white;
}
.user-screen-name {
+ color: white;
font-weight: lighter;
font-size: 15px;
padding-right: 0.1em;
@@ -211,14 +217,12 @@
}
button {
- border: solid;
- border-width: 1px;
width: 92%;
height: 100%;
}
.pressed {
- border: solid;
- border-width: 1px;
+ border-bottom-color: rgba(255, 255, 255, 0.2);
+ border-top-color: rgba(0, 0, 0, 0.2);
}
}
}