4 files changed, 12 insertions, 16 deletions

diff --git a/client/src/app/+admin/follows/following-add/following-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html
index 72635048c..e08decb3f 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.html
+++ b/client/src/app/+admin/follows/following-add/following-add.component.html
@@ -18,5 +18,5 @@
     It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers.
   </div>
 
-  <input type="submit" i18n-value value="Add following" [disabled]="hostsError || !hostsString" class="btn btn-default">
+  <input type="submit" i18n-value value="Add following" [disabled]="hostsError || !hostsString" class="btn btn-secondary">
 </form>
diff --git a/client/src/app/+admin/follows/follows.component.html b/client/src/app/+admin/follows/follows.component.html
index a8258bf70..8eabb3392 100644
--- a/client/src/app/+admin/follows/follows.component.html
+++ b/client/src/app/+admin/follows/follows.component.html
@@ -1,13 +1,15 @@
 <div class="admin-sub-header">
   <div i18n class="form-sub-title">Manage follows</div>
 
-  <tabset #followsMenuTabs>
-    <tab *ngFor="let link of links">
-      <ng-template tabHeading>
+  <ngb-tabset #followsMenuTabs type="pills">
+
+    <ngb-tab *ngFor="let link of links">
+      <ng-template ngbTabTitle>
         <a class="tab-link" [routerLink]="link.path">{{ link.title }}</a>
       </ng-template>
-    </tab>
-  </tabset>
+    </ngb-tab>
+
+  </ngb-tabset>
 </div>
 
 <router-outlet></router-outlet>
diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss
index 08b3737f8..766d7853b 100644
--- a/client/src/app/+admin/follows/follows.component.scss
+++ b/client/src/app/+admin/follows/follows.component.scss
@@ -2,9 +2,3 @@
   flex-grow: 0;
   margin-right: 30px;
 }
-
-/deep/ .tab-content {
-  height: 0;
-  min-height: 0;
-  padding: 0;
-}
diff --git a/client/src/app/+admin/follows/follows.component.ts b/client/src/app/+admin/follows/follows.component.ts
index f7af9826c..b6f7715b3 100644
--- a/client/src/app/+admin/follows/follows.component.ts
+++ b/client/src/app/+admin/follows/follows.component.ts
@@ -1,14 +1,14 @@
 import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'
 import { NavigationEnd, Router } from '@angular/router'
-import { TabsetComponent } from 'ngx-bootstrap/tabs'
 import { I18n } from '@ngx-translate/i18n-polyfill'
+import { NgbTabset } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   templateUrl: './follows.component.html',
   styleUrls: [ './follows.component.scss' ]
 })
 export class FollowsComponent implements OnInit, AfterViewInit {
-  @ViewChild('followsMenuTabs') followsMenuTabs: TabsetComponent
+  @ViewChild('followsMenuTabs') followsMenuTabs: NgbTabset
 
   links: { path: string, title: string }[] = []
 
@@ -53,8 +53,8 @@ export class FollowsComponent implements OnInit, AfterViewInit {
     for (let i = 0; i < this.links.length; i++) {
       const path = this.links[i].path
 
-      if (url.endsWith(path) === true && this.followsMenuTabs.tabs[i]) {
-        this.followsMenuTabs.tabs[i].active = true
+      if (url.endsWith(path) === true) {
+        this.followsMenuTabs.select(path)
         return
       }
     }