Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Hau Vo
pleroma-fe
Commits
c5519fa5
Commit
c5519fa5
authored
Feb 26, 2019
by
Tae Hoon
Browse files
Improve mobile layout of user card
parent
1fecac9b
Changes
3
Show whitespace changes
Inline
Side-by-side
src/components/basic_user_card/basic_user_card.vue
View file @
c5519fa5
...
...
@@ -13,10 +13,13 @@
<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>
...
...
@@ -49,6 +52,7 @@
margin-left
:
0
.7em
;
text-align
:
left
;
flex
:
1
;
min-width
:
0
;
}
&
-primary-secondary-wrapper
{
...
...
@@ -59,6 +63,8 @@
&
-primary-area
{
flex
:
1
;
margin-right
:
1em
;
min-width
:
0
;
}
&
-user-name
{
...
...
@@ -100,5 +106,15 @@
margin-bottom
:
0
;
}
}
@media
(
min-width
:
320px
)
and
(
max-width
:
480px
)
{
&
-primary-secondary-wrapper
{
flex-direction
:
column
;
}
&
-primary-area
{
margin-right
:
0
;
}
}
}
</
style
>
src/components/follow_card/follow_card.vue
View file @
c5519fa5
<
template
>
<basic-user-card
:user=
"user"
>
<template
slot=
"primary-area"
>
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
{{
isMe
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
</span>
</
template
>
<
template
slot=
"secondary-area"
>
<button
v-if=
"showFollow"
...
...
@@ -27,11 +32,6 @@
</
template
>
</button>
</template>
<
template
slot=
"tertiary-area"
>
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
{{
isMe
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
</span>
</
template
>
</basic-user-card>
</template>
...
...
src/components/follow_request_card/follow_request_card.vue
View file @
c5519fa5
...
...
@@ -22,6 +22,10 @@
flex
:
1
1
;
max-width
:
12em
;
min-width
:
8em
;
&
:last-child
{
margin-right
:
0
;
}
}
}
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment