11 files changed, 30 insertions, 38 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html
index a17b13fdf..bbf946df0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-advanced-configuration.component.html
@@ -3,7 +3,7 @@
   <div class="row mt-5"> <!-- cache grid -->
 
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">CACHE</div>
+      <h2 i18n class="inner-form-title">CACHE</h2>
       <div i18n class="inner-form-description">
         Some files are not federated, and fetched when necessary. Define their caching policies.
       </div>
@@ -60,7 +60,7 @@
   <div class="row mt-4"> <!-- cache grid -->
     <div class="col-12 col-lg-4 col-xl-3">
       <div class="anchor" id="customizations"></div> <!-- customizations anchor -->
-      <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
+      <h2 i18n class="inner-form-title">CUSTOMIZATIONS</h2>
       <div i18n class="inner-form-description">
         Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.
       </div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index 9fc332308..50533ef73 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -1,7 +1,7 @@
 <ng-container [formGroup]="form">
   <div class="row mt-5"> <!-- appearance grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">APPEARANCE</div>
+      <h2 i18n class="inner-form-title">APPEARANCE</h2>
       <div i18n class="inner-form-description">
         Use <a class="link-orange" routerLink="/admin/plugins">plugins & themes</a> for more involved changes, or add slight <a class="link-orange" routerLink="/admin/config/edit-custom" fragment="advanced-configuration">customizations</a>.
       </div>
@@ -91,7 +91,7 @@
 
   <div class="row mt-4"> <!-- broadcast grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">BROADCAST MESSAGE</div>
+      <h2 i18n class="inner-form-title">BROADCAST MESSAGE</h2>
       <div i18n class="inner-form-description">
         Display a message on your instance
       </div>
@@ -147,7 +147,7 @@
 
   <div class="row mt-4"> <!-- new users grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">NEW USERS</div>
+      <h2 i18n class="inner-form-title">NEW USERS</h2>
       <div i18n class="inner-form-description">
         Manage <a class="link-orange" routerLink="/admin/users">users</a> to set their quota individually.
       </div>
@@ -264,7 +264,7 @@
 
   <div class="row mt-4"> <!-- videos grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">VIDEOS</div>
+      <h2 i18n class="inner-form-title">VIDEOS</h2>
     </div>
 
     <div class="col-12 col-lg-8 col-xl-9">
@@ -350,7 +350,7 @@
 
   <div class="row mt-4"> <!-- video channels grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">VIDEO CHANNELS</div>
+      <h2 i18n class="inner-form-title">VIDEO CHANNELS</h2>
     </div>
 
     <div class="col-12 col-lg-8 col-xl-9">
@@ -372,7 +372,7 @@
 
   <div class="row mt-4"> <!-- search grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">SEARCH</div>
+      <h2 i18n class="inner-form-title">SEARCH</h2>
     </div>
 
     <div class="col-12 col-lg-8 col-xl-9">
@@ -461,7 +461,7 @@
 
   <div class="row mt-4"> <!-- federation grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">FEDERATION</div>
+      <h2 i18n class="inner-form-title">FEDERATION</h2>
       <div i18n class="inner-form-description">
         Manage <a class="link-orange" routerLink="/admin/follows">relations</a> with other instances.
       </div>
@@ -540,7 +540,7 @@
 
   <div class="row mt-4"> <!-- administrators grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">ADMINISTRATORS</div>
+      <h2 i18n class="inner-form-title">ADMINISTRATORS</h2>
     </div>
 
     <div class="col-12 col-lg-8 col-xl-9">
@@ -568,7 +568,7 @@
 
   <div class="row mt-4"> <!-- Twitter grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">TWITTER</div>
+      <h2 i18n class="inner-form-title">TWITTER</h2>
       <div i18n class="inner-form-description">
         Provide the Twitter account representing your instance to improve link previews.
         If you don't have a Twitter account, just leave the default value.
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
index 3d8414f5c..fd009367f 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-homepage.component.html
@@ -4,7 +4,7 @@
 
     <div class="homepage row mt-5"> <!-- homepage grid -->
       <div class="col-12 col-lg-4 col-xl-3">
-        <div i18n class="inner-form-title">INSTANCE HOMEPAGE</div>
+        <h2 i18n class="inner-form-title">INSTANCE HOMEPAGE</h2>
       </div>
 
       <div class="col-12 col-lg-8 col-xl-9">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
index ff79ecc88..60f1aee2e 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-instance-information.component.html
@@ -4,7 +4,7 @@
 
     <div class="row mt-5"> <!-- instance grid -->
       <div class="col-12 col-lg-4 col-xl-3">
-        <div i18n class="inner-form-title">INSTANCE</div>
+        <h2 i18n class="inner-form-title">INSTANCE</h2>
       </div>
 
       <div class="col-12 col-lg-8 col-xl-9">
@@ -76,7 +76,7 @@
 
     <div class="row mt-4"> <!-- moderation & nsfw grid -->
       <div class="col-12 col-lg-4 col-xl-3">
-        <div i18n class="inner-form-title">MODERATION & NSFW</div>
+        <h2 i18n class="inner-form-title">MODERATION & NSFW</h2>
         <div i18n class="inner-form-description">
           Manage <a class="link-orange" routerLink="/admin/users">users</a> to build a moderation team.
         </div>
@@ -154,7 +154,7 @@
 
     <div class="row mt-4"> <!-- you and your instance grid -->
       <div class="col-12 col-lg-4 col-xl-3">
-        <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
+        <h2 i18n class="inner-form-title">YOU AND YOUR INSTANCE</h2>
       </div>
 
       <div class="col-12 col-lg-8 col-xl-9">
@@ -204,7 +204,7 @@
 
     <div class="row mt-4"> <!-- other information grid -->
       <div class="col-12 col-lg-4 col-xl-3">
-        <div i18n class="inner-form-title">OTHER INFORMATION</div>
+        <h2 i18n class="inner-form-title">OTHER INFORMATION</h2>
       </div>
 
       <div class="col-12 col-lg-8 col-xl-9">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
index e9919741f..1ba3bdfe0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
@@ -2,7 +2,7 @@
 
   <div class="row mt-5">
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">LIVE</div>
+      <h2 i18n class="inner-form-title">LIVE</h2>
       <div i18n class="inner-form-description">
         Enable users of your instance to stream live.
       </div>
@@ -89,7 +89,7 @@
 
   <div class="row"> <!-- transcoding live streams grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">TRANSCODING</div>
+      <h2 i18n class="inner-form-title">TRANSCODING</h2>
       <div i18n class="inner-form-description">
         Same as VOD transcoding, transcoding live streams so that they are in a streamable form that any device can play. Requires a beefy CPU, and then some.
       </div>
@@ -111,7 +111,7 @@
           </div>
 
           <div class="callout callout-light pt-2 mt-2 pb-0">
-            <label i18n>Output formats</label>
+            <h3 class="callout-title" i18n>Output formats</h3>
 
             <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
               <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index d3fc2e481..fb750aca6 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -18,7 +18,7 @@
 
   <div class="row mt-4"> <!-- transcoding grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">TRANSCODING</div>
+      <h2 i18n class="inner-form-title">TRANSCODING</h2>
       <div i18n class="inner-form-description">
         Process uploaded videos so that they are in a streamable form that any device can play. Though costly in
         resources, this is a critical part of PeerTube, so tread carefully.
@@ -38,7 +38,7 @@
             <ng-container ngProjectAs="extra">
 
               <div class="callout callout-light pt-2 pb-0">
-                <label i18n>Input formats</label>
+                <h3 class="callout-title" i18n>Input formats</h3>
 
                 <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
                   <my-peertube-checkbox
@@ -65,7 +65,7 @@
               </div>
 
               <div class="callout callout-light pt-2 mt-2 pb-0">
-                <label i18n>Output formats</label>
+                <h3 class="callout-title" i18n>Output formats</h3>
 
                 <ng-container formGroupName="webtorrent">
                   <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
@@ -108,7 +108,7 @@
                 </ng-container>
 
                 <div class="form-group" [ngClass]="getTranscodingDisabledClass()">
-                  <label i18n>Resolutions to generate</label>
+                  <div class="mb-2 fw-bold" i18n>Resolutions to generate</div>
 
                   <div class="ms-2 d-flex flex-column">
                     <my-peertube-checkbox
@@ -211,7 +211,7 @@
 
   <div class="row mt-2"> <!-- video studio grid -->
     <div class="col-12 col-lg-4 col-xl-3">
-      <div i18n class="inner-form-title">VIDEO STUDIO</div>
+      <h2 i18n class="inner-form-title">VIDEO STUDIO</h2>
       <div i18n class="inner-form-description">
         Allows your users to edit their video (cut, add intro/outro, add a watermark etc)
       </div>
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index 1605190f6..f46f36375 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -20,10 +20,10 @@
         >
         </my-action-dropdown>
 
-        <a *ngIf="!isInSelectionMode()" class="follow-button" (click)="openFollowModal()" (key.enter)="openFollowModal()">
+        <button *ngIf="!isInSelectionMode()" class="peertube-create-button" (click)="openFollowModal()">
           <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Follow</ng-container>
-        </a>
+        </button>
       </div>
 
       <div class="ms-auto">
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.scss b/client/src/app/+admin/follows/following-list/following-list.component.scss
index 0de80e563..405ddae5c 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.scss
+++ b/client/src/app/+admin/follows/following-list/following-list.component.scss
@@ -16,10 +16,6 @@ a {
   }
 }
 
-.follow-button {
-  @include create-button;
-}
-
 my-delete-button {
   max-width: 130px;
 }
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index ce3226857..7b3eadac2 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -219,17 +219,17 @@
 
     <div class="danger-zone">
       <div class="form-group">
-        <label i18n>Send a link to reset the password by email to the user</label>
+        <div class="mb-1 fw-bold" i18n>Send a link to reset the password by email to the user</div>
         <button (click)="resetPassword()" i18n>Ask for new password</button>
       </div>
 
       <div class="form-group">
-        <label i18n>Manually set the user password</label>
+        <div class="mb-1 fw-bold" i18n>Manually set the user password</div>
         <my-user-password [userId]="user.id" [username]="user.username"></my-user-password>
       </div>
 
       <div *ngIf="user.twoFactorEnabled" class="form-group">
-        <label i18n>This user has two factor authentication enabled</label>
+        <div class="mb-1 fw-bold" i18n>This user has two factor authentication enabled</div>
         <button (click)="disableTwoFactorAuth()" i18n>Disable two factor authentication</button>
       </div>
     </div>
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html
index b7467d2cb..8c90f5a45 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html
@@ -20,7 +20,7 @@
         >
         </my-action-dropdown>
 
-        <a *ngIf="!isInSelectionMode()" class="add-button" routerLink="/admin/users/create">
+        <a *ngIf="!isInSelectionMode()" class="peertube-create-button" routerLink="/admin/users/create">
           <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Create user</ng-container>
         </a>
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
index 2a3b955d2..559a00251 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
@@ -2,10 +2,6 @@
 @use '_mixins' as *;
 @use 'bootstrap/scss/functions' as *;
 
-.add-button {
-  @include create-button;
-}
-
 tr.banned > td {
   background-color: lighten($color: $red, $amount: 40) !important;
 }