diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html
index fbca9f3b0..50e00b651 100644
--- a/client/src/app/+about/about-follows/about-follows.component.html
+++ b/client/src/app/+about/about-follows/about-follows.component.html
@@ -9,7 +9,7 @@
{{ follower }}
- Show full list
+ Show full list
@@ -17,11 +17,19 @@
This instance is not following any other.
+<<<<<<< HEAD
+||||||| parent of 932e04c48 (Change button)
+
This instance does not have instances followings.
+
+=======
+
This instance does not have instances followings.
+
+>>>>>>> 932e04c48 (Change button)
{{ following }}
-
-
Show full list
+
+
Show full list
diff --git a/client/src/app/+about/about-follows/about-follows.component.scss b/client/src/app/+about/about-follows/about-follows.component.scss
index 32a015e89..f01484702 100644
--- a/client/src/app/+about/about-follows/about-follows.component.scss
+++ b/client/src/app/+about/about-follows/about-follows.component.scss
@@ -17,6 +17,8 @@ a {
justify-content: flex-start;
}
-#showMore {
- color: black;
+.showMore {
+ @include peertube-button-link;
+ padding: 0;
+ text-align: left;
}
diff --git a/client/src/app/+about/about-follows/about-follows.component.ts b/client/src/app/+about/about-follows/about-follows.component.ts
index d88974b59..e5526248c 100644
--- a/client/src/app/+about/about-follows/about-follows.component.ts
+++ b/client/src/app/+about/about-follows/about-follows.component.ts
@@ -14,8 +14,8 @@ export class AboutFollowsComponent implements OnInit {
followers: string[] = []
followings: string[] = []
- showMoreFollowers = false;
- showMoreFollowings = false;
+ showMoreFollowers = false
+ showMoreFollowings = false
followersPagination: ComponentPagination = {
currentPage: 1,
@@ -49,7 +49,7 @@ export class AboutFollowsComponent implements OnInit {
}
loadAllFollowings () {
- while(hasMoreItems(this.followingsPagination)) {
+ while (hasMoreItems(this.followingsPagination)) {
this.followingsPagination.currentPage += 1
this.loadMoreFollowings()
@@ -57,10 +57,10 @@ export class AboutFollowsComponent implements OnInit {
}
loadAllFollowers () {
- while(hasMoreItems(this.followersPagination)) {
+ while (hasMoreItems(this.followersPagination)) {
this.followersPagination.currentPage += 1
-
- this.loadMoreFollowers();
+
+ this.loadMoreFollowers()
}
}