Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
pleroma-fe
Merge requests
!698
#452
- unfollow button issue
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
#452
- unfollow button issue
Dave/pleroma-fe:issue-452-unfollow-button
into
develop
Overview
2
Commits
2
Pipelines
2
Changes
1
Merged
Dave LiPuma
requested to merge
Dave/pleroma-fe:issue-452-unfollow-button
into
develop
6 years ago
Overview
2
Commits
2
Pipelines
2
Changes
1
Expand
Closes
#452 (closed)
1
0
Merge request reports
Compare
develop
version 1
dfcdf4f3
6 years ago
develop (base)
and
latest version
latest version
23bae671
2 commits,
6 years ago
version 1
dfcdf4f3
1 commit,
6 years ago
1 file
+
13
−
11
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/components/follow_card/follow_card.vue
+
13
−
11
Options
@@ -4,12 +4,12 @@
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
{{
isMe
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
</span>
<div
class=
"
btn-
follow"
v-if=
"showFollow && !loggedIn"
>
<div
class=
"follow
-card-follow-button
"
v-if=
"showFollow && !loggedIn"
>
<RemoteFollow
:user=
"user"
/>
</div>
<button
v-if=
"showFollow && loggedIn"
class=
"btn btn-default
btn-
follow"
class=
"btn btn-default follow
-card-follow-button
"
@
click=
"followUser"
:disabled=
"inProgress"
:title=
"requestSent ? $t('user_card.follow_again') : ''"
@@ -24,7 +24,7 @@
{{
$t
(
'
user_card.follow
'
)
}}
</
template
>
</button>
<button
v-if=
"following"
class=
"btn btn-default pressed"
@
click=
"unfollowUser"
:disabled=
"inProgress"
>
<button
v-if=
"following"
class=
"btn btn-default
follow-card-follow-button
pressed"
@
click=
"unfollowUser"
:disabled=
"inProgress"
>
<
template
v-if=
"inProgress"
>
{{
$t
(
'
user_card.follow_progress
'
)
}}
</
template
>
@@ -39,15 +39,17 @@
<
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
;
.follow-card
{
&
-content-container
{
flex-shrink
:
0
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
flex-wrap
:
wrap
;
line-height
:
1
.5em
;
}
.btn
-follow
{
&
-follow
-button
{
margin-top
:
0
.5em
;
margin-left
:
auto
;
width
:
10em
;
Loading