Page MenuHomePhorge
Files F85650983

No OneTemporary
Actions

Size
7 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 0563360a6d..ff3d0d09ee 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,120 +1,78 @@
<template>
<div class="user-card">
<router-link :to="userProfileLink(user)">
<UserAvatar class="avatar" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
</router-link>
<div class="user-card-expanded-content" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content>
</div>
<div class="user-card-collapsed-content" v-else>
- <div class="user-card-primary-secondary-wrapper">
- <div class="user-card-primary-area">
- <div :title="user.name" class="user-card-user-name">
- <span v-if="user.name_html" v-html="user.name_html"></span>
- <span v-else>{{ user.name }}</span>
- </div>
- <div>
- <router-link :to="userProfileLink(user)">
- @{{user.screen_name}}
- </router-link>
- </div>
- <slot name="primary-area"></slot>
- </div>
- <div class="user-card-secondary-area">
- <slot name="secondary-area"></slot>
- </div>
+ <div :title="user.name" class="user-card-user-name">
+ <span v-if="user.name_html" v-html="user.name_html"></span>
+ <span v-else>{{ user.name }}</span>
</div>
- <div class="user-card-tertiary-area">
- <slot name="tertiary-area"></slot>
+ <div>
+ <router-link :to="userProfileLink(user)">
+ @{{user.screen_name}}
+ </router-link>
</div>
+ <slot></slot>
</div>
</div>
</template>
<script src="./basic_user_card.js"></script>
<style lang="scss">
@import '../../_variables.scss';
.user-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);
&-collapsed-content {
margin-left: 0.7em;
text-align: left;
flex: 1;
- min-width: 0;
- }
-
- &-primary-secondary-wrapper {
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- }
-
- &-primary-area {
- flex: 1;
- margin-right: 1em;
- min-width: 0;
}
&-user-name {
img {
object-fit: contain;
height: 16px;
width: 16px;
vertical-align: middle;
}
}
- &-secondary-area {
- flex: none;
-
- .btn {
- margin-top: .5em;
- width: 10em;
- }
- }
-
&-expanded-content {
flex: 1;
margin-left: 0.7em;
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;
.panel-heading {
background: transparent;
flex-direction: column;
align-items: stretch;
}
p {
margin-bottom: 0;
}
}
-
- @media (min-width: 320px) and (max-width: 480px) {
- &-primary-secondary-wrapper {
- flex-direction: column;
- }
-
- &-primary-area {
- margin-right: 0;
- }
- }
}
</style>
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index ed7fe30bde..8eb56e2500 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -1,24 +1,34 @@
<template>
<basic-user-card :user="user">
- <template slot="secondary-area">
+ <div class="block-card-content-container">
<button class="btn btn-default" @click="unblockUser" :disabled="progress" v-if="blocked">
<template v-if="progress">
{{ $t('user_card.unblock_progress') }}
</template>
<template v-else>
{{ $t('user_card.unblock') }}
</template>
</button>
<button class="btn btn-default" @click="blockUser" :disabled="progress" v-else>
<template v-if="progress">
{{ $t('user_card.block_progress') }}
</template>
<template v-else>
{{ $t('user_card.block') }}
</template>
</button>
- </template>
+ </div>
</basic-user-card>
</template>
-<script src="./block_card.js"></script>
\ No newline at end of file
+<script src="./block_card.js"></script>
+
+<style lang="scss">
+.block-card-content-container {
+ margin-top: 0.5em;
+ text-align: right;
+ button {
+ width: 10em;
+ }
+}
+</style>
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 8e6dd2fb85..1ae728a618 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -1,38 +1,53 @@
<template>
<basic-user-card :user="user">
- <template slot="primary-area">
- <span class="faint" v-if="!noFollowsYou && user.follows_you">
+ <div class="follow-card-content-container">
+ <span class="faint">
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
</span>
- </template>
- <template slot="secondary-area">
<button
v-if="showFollow"
class="btn btn-default"
@click="followUser"
:disabled="inProgress"
:title="requestSent ? $t('user_card.follow_again') : ''"
>
<template v-if="inProgress">
{{ $t('user_card.follow_progress') }}
</template>
<template v-else-if="requestSent">
{{ $t('user_card.follow_sent') }}
</template>
<template v-else>
{{ $t('user_card.follow') }}
</template>
</button>
<button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
<template v-if="inProgress">
{{ $t('user_card.follow_progress') }}
</template>
<template v-else>
{{ $t('user_card.follow_unfollow') }}
</template>
</button>
- </template>
+ </div>
</basic-user-card>
</template>
<script src="./follow_card.js"></script>
+
+<style lang="scss">
+.follow-card-content-container {
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ line-height: 1.5em;
+
+ .btn {
+ margin-top: 0.5em;
+ margin-left: auto;
+ width: 10em;
+ }
+}
+</style>
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 45d02b8943..4a3bbba49a 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -1,31 +1,29 @@
<template>
<basic-user-card :user="user">
- <template slot="tertiary-area">
- <div class="follow-request-card-btns-container">
- <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
- <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
- </div>
- </template>
+ <div class="follow-request-card-content-container">
+ <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
+ <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
+ </div>
</basic-user-card>
</template>
<script src="./follow_request_card.js"></script>
<style lang="scss">
-.follow-request-card-btns-container {
+.follow-request-card-content-container {
display: flex;
flex-direction: row;
flex-wrap: wrap;
button {
margin-top: 0.5em;
margin-right: 0.5em;
flex: 1 1;
max-width: 12em;
min-width: 8em;
&:last-child {
margin-right: 0;
}
}
}
</style>

File Metadata

Mime Type
text/x-diff
Expires
Sun, Aug 30, 9:04 AM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1737874
Default Alt Text
(7 KB)

Event Timeline