Use grid to organise settings in admin, my-account
authorRigel Kent <sendmemail@rigelk.eu>
Sun, 8 Mar 2020 16:33:40 +0000 (17:33 +0100)
committerChocobozzz <chocobozzz@cpy.re>
Tue, 10 Mar 2020 15:23:40 +0000 (16:23 +0100)
23 files changed:
client/src/app/+about/about.component.html
client/src/app/+admin/admin.component.html
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
client/src/app/+admin/plugins/shared/toggle-plugin-type.scss
client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.scss
client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.html
client/src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.scss
client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html
client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss
client/src/app/+my-account/my-account-settings/my-account-settings.component.html
client/src/app/+my-account/my-account-settings/my-account-settings.component.scss
client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.scss
client/src/app/+my-account/shared/actor-avatar-info.component.ts
client/src/app/shared/forms/markdown-textarea.component.scss
client/src/app/shared/menu/top-menu-dropdown.component.html
client/src/sass/application.scss
client/src/sass/bootstrap.scss
client/src/sass/include/_mixins.scss
config/default.yaml
server/tests/api/server/config.ts
server/tests/client.ts

index 0c4a5156d6bee85c177585e4474117c3021cb2ed..da16b933d90d3e8008c2312a08868027fdc03a06 100644 (file)
@@ -2,11 +2,11 @@
   <div class="sub-menu">
 
     <div class="links">
-      <a i18n routerLink="instance" routerLinkActive="active" class="title-page">Instance</a>
+      <a i18n routerLink="instance" routerLinkActive="active" class="title-page title-page-about">Instance</a>
 
-      <a i18n routerLink="peertube" routerLinkActive="active" class="title-page">PeerTube</a>
+      <a i18n routerLink="peertube" routerLinkActive="active" class="title-page title-page-about">PeerTube</a>
 
-      <a i18n routerLink="follows" routerLinkActive="active" class="title-page">Follows</a>
+      <a i18n routerLink="follows" routerLinkActive="active" class="title-page title-page-about">Follows</a>
     </div>
   </div>
 
index 6c98fe45388dfbbe22402182dd8eede57ed2e10f..76d297c52abd096e7097a5aee2301a9f525efc03 100644 (file)
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="sub-menu">
     <ng-template #linkTemplate let-item="item">
-      <a [routerLink]="item.routerLink" routerLinkActive="active" class="title-page">{{ item.label }}</a>
+      <a [routerLink]="item.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ item.label }}</a>
     </ng-template>
 
     <list-overflow [items]="items" [itemTemplate]="linkTemplate"></list-overflow>
index 2cf0e5fd9fe549346fd315088ae58840339043f2..77e857d6b529a4a32fd39f78e2bf7321146e68d6 100644 (file)
 
         <ng-container formGroupName="instance">
 
-          <div i18n class="inner-form-title">INSTANCE</div>
-
-          <div class="form-group">
-            <label i18n for="instanceName">Name</label>
-            <input
-              type="text" id="instanceName"
-              formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }"
-            >
-            <div *ngIf="formErrors.instance.name" class="form-error">{{ formErrors.instance.name }}</div>
-          </div>
+          <div class="form-row mt-5"> <!-- instance grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">INSTANCE</div>
+            </div>
 
-          <div class="form-group">
-            <label i18n for="instanceShortDescription">Short description</label>
-            <textarea
-              id="instanceShortDescription" formControlName="shortDescription" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div>
-          </div>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-          <div class="form-group">
-            <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
-            <my-markdown-textarea
-              name="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
-              [classes]="{ 'input-error': formErrors['instance.description'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceName">Name</label>
+                <input
+                  type="text" id="instanceName"
+                  formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }"
+                >
+                <div *ngIf="formErrors.instance.name" class="form-error">{{ formErrors.instance.name }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceCategories">Main instance categories</label>
+              <div class="form-group">
+                <label i18n for="instanceShortDescription">Short description</label>
+                <textarea
+                  id="instanceShortDescription" formControlName="shortDescription" class="small"
+                  [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div>
+              </div>
 
-            <div>
-              <p-multiSelect
-                inputId="instanceCategories" [options]="categoryItems" formControlName="categories" [showToggleAll]="false"
-                [defaultLabel]="getDefaultCategoryLabel()" [selectedItemsLabel]="getSelectedCategoryLabel()"
-                emptyFilterMessage="No results found" i18n-emptyFilterMessage
-              ></p-multiSelect>
-            </div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  name="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
+                  [classes]="{ 'input-error': formErrors['instance.description'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceLanguages">Main languages you/your moderators speak</label>
+              <div class="form-group">
+                <label i18n for="instanceCategories">Main instance categories</label>
+
+                <div>
+                  <p-multiSelect
+                    inputId="instanceCategories" [options]="categoryItems" formControlName="categories" [showToggleAll]="false"
+                    [defaultLabel]="getDefaultCategoryLabel()" [selectedItemsLabel]="getSelectedCategoryLabel()"
+                    emptyFilterMessage="No results found" i18n-emptyFilterMessage
+                  ></p-multiSelect>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label i18n for="instanceLanguages">Main languages you/your moderators speak</label>
+
+                <div>
+                  <p-multiSelect
+                    inputId="instanceLanguages" [options]="languageItems" formControlName="languages" [showToggleAll]="false"
+                    [defaultLabel]="getDefaultLanguageLabel()" [selectedItemsLabel]="getSelectedLanguageLabel()"
+                    emptyFilterMessage="No results found" i18n-emptyFilterMessage
+                  ></p-multiSelect>
+                </div>
+              </div>
 
-            <div>
-              <p-multiSelect
-                inputId="instanceLanguages" [options]="languageItems" formControlName="languages" [showToggleAll]="false"
-                [defaultLabel]="getDefaultLanguageLabel()" [selectedItemsLabel]="getSelectedLanguageLabel()"
-                emptyFilterMessage="No results found" i18n-emptyFilterMessage
-              ></p-multiSelect>
             </div>
           </div>
 
-          <div i18n class="inner-form-title">MODERATION & NSFW</div>
+          <div class="form-row mt-4"> <!-- moderation & nsfw grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">MODERATION & NSFW</div>
+            </div>
 
-          <div class="form-group">
-            <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
-              <ng-template ptTemplate="label">
-                <ng-container i18n>This instance is dedicated to sensitive or NSFW content</ng-container>
-              </ng-template>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-              <ng-template ptTemplate="help">
-                <ng-container i18n>
-                  Enabling it will allow other administrators to know that you are mainly federating sensitive content.<br /><br />
-                  Moreover, the NSFW checkbox on video upload will be automatically checked by default.
-                </ng-container>
-              </ng-template>
-            </my-peertube-checkbox>
-          </div>
+              <div class="form-group">
+                <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
+                  <ng-template ptTemplate="label">
+                    <ng-container i18n>This instance is dedicated to sensitive or NSFW content</ng-container>
+                  </ng-template>
 
-          <div class="form-group">
-            <label i18n for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
+                  <ng-template ptTemplate="help">
+                    <ng-container i18n>
+                      Enabling it will allow other administrators to know that you are mainly federating sensitive content.<br /><br />
+                      Moreover, the NSFW checkbox on video upload will be automatically checked by default.
+                    </ng-container>
+                  </ng-template>
+                </my-peertube-checkbox>
+              </div>
 
-            <my-help>
-              <ng-template ptTemplate="customHtml">
-                <ng-container i18n>
-                  With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video.
-                </ng-container>
-              </ng-template>
-            </my-help>
-
-            <div class="peertube-select-container">
-              <select id="instanceDefaultNSFWPolicy" formControlName="defaultNSFWPolicy">
-                <option i18n value="do_not_list">Do not list</option>
-                <option i18n value="blur">Blur thumbnails</option>
-                <option i18n value="display">Display</option>
-              </select>
-            </div>
-            <div *ngIf="formErrors.instance.defaultNSFWPolicy" class="form-error">{{ formErrors.instance.defaultNSFWPolicy }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
 
-          <div class="form-group">
-            <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
-            <my-markdown-textarea
-              name="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
-              [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
-          </div>
+                <my-help>
+                  <ng-template ptTemplate="customHtml">
+                    <ng-container i18n>
+                      With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video.
+                    </ng-container>
+                  </ng-template>
+                </my-help>
+
+                <div class="peertube-select-container">
+                  <select id="instanceDefaultNSFWPolicy" formControlName="defaultNSFWPolicy">
+                    <option i18n value="do_not_list">Do not list</option>
+                    <option i18n value="blur">Blur thumbnails</option>
+                    <option i18n value="display">Display</option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.instance.defaultNSFWPolicy" class="form-error">{{ formErrors.instance.defaultNSFWPolicy }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
-            <my-markdown-textarea
-              name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
-              [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  name="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
+                  [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceModerationInformation">Moderation information</label><my-help helpType="markdownText"></my-help>
-            <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
+              <div class="form-group">
+                <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
+                  [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
+              </div>
 
-            <my-markdown-textarea
-              name="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
-              [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
+              <div class="form-group">
+                <label i18n for="instanceModerationInformation">Moderation information</label><my-help helpType="markdownText"></my-help>
+                <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
+
+                <my-markdown-textarea
+                  name="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
+                  [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
+              </div>
+
+            </div>
           </div>
 
-          <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
+          <div class="form-row mt-4"> <!-- you and your instance grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
+            </div>
 
-          <div class="form-group">
-            <label i18n for="instanceAdministrator">Who is behind the instance?</label>
-            <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-            <my-markdown-textarea
-              name="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
-              [classes]="{ 'input-error': formErrors['instance.administrator'] }"
-            ></my-markdown-textarea>
+              <div class="form-group">
+                <label i18n for="instanceAdministrator">Who is behind the instance?</label>
+                <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
 
-            <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div>
-          </div>
+                <my-markdown-textarea
+                  name="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+                  [classes]="{ 'input-error': formErrors['instance.administrator'] }"
+                ></my-markdown-textarea>
 
-          <div class="form-group">
-            <label i18n for="instanceCreationReason">Why did you create this instance?</label>
-            <div i18n class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
+                <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div>
+              </div>
 
-            <textarea
-              id="instanceCreationReason" formControlName="creationReason" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.creationReason'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceCreationReason">Why did you create this instance?</label>
+                <div i18n class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
+
+                <textarea
+                  id="instanceCreationReason" formControlName="creationReason" class="small"
+                  [ngClass]="{ 'input-error': formErrors['instance.creationReason'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceMaintenanceLifetime">How long do you plan to maintain this instance?</label>
-            <div i18n class="label-small-info">It's important to know for users who want to register on your instance</div>
+              <div class="form-group">
+                <label i18n for="instanceMaintenanceLifetime">How long do you plan to maintain this instance?</label>
+                <div i18n class="label-small-info">It's important to know for users who want to register on your instance</div>
+
+                <textarea
+                  id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" class="small"
+                  [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div>
+              </div>
+
+              <div class="form-group">
+                <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label>
+                <div i18n class="label-small-info">With your own funds? With user donations? Advertising?</div>
+
+                <textarea
+                  id="instanceBusinessModel" formControlName="businessModel" class="small"
+                  [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
+              </div>
 
-            <textarea
-              id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div>
+            </div>
           </div>
 
-          <div class="form-group">
-            <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label>
-            <div i18n class="label-small-info">With your own funds? With users donations? Advertising?</div>
+          <div class="form-row mt-4"> <!-- other information grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">OTHER INFORMATION</div>
+            </div>
 
-            <textarea
-              id="instanceBusinessModel" formControlName="businessModel" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
-          </div>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-          <div i18n class="inner-form-title">OTHER INFORMATION</div>
+              <div class="form-group">
+                <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
+                <div i18n class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
 
-          <div class="form-group">
-            <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
-            <div i18n class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
+                <my-markdown-textarea
+                  name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+                  [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
+                ></my-markdown-textarea>
 
-            <my-markdown-textarea
-              name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
-              [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
-            ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
+              </div>
 
-            <div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
+            </div>
           </div>
 
         </ng-container>
     <ngb-tab i18n-title title="Basic configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">THEME AND DEFAULT ROUTE</div>
-
-        <ng-container formGroupName="theme">
-          <div class="form-group">
-            <label i18n for="themeDefault">Global theme</label>
-
-            <div class="peertube-select-container">
-              <select formControlName="default" id="themeDefault">
-                <option i18n value="default">default</option>
-
-                <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
-              </select>
-            </div>
+        <div class="form-row mt-5"> <!-- appearance grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">APPEARANCE</div>
           </div>
-        </ng-container>
 
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div class="form-group" formGroupName="instance">
-          <label i18n for="instanceDefaultClientRoute">Default client route</label>
-          <div class="peertube-select-container">
-            <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute">
-              <option i18n value="/videos/overview">Discover videos</option>
-              <option i18n value="/videos/trending">Trending videos</option>
-              <option i18n value="/videos/most-liked">Most liked videos</option>
-              <option i18n value="/videos/recently-added">Recently added videos</option>
-              <option i18n value="/videos/local">Local videos</option>
-            </select>
-          </div>
-          <div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
-        </div>
+            <ng-container formGroupName="theme">
+              <div class="form-group">
+                <label i18n for="themeDefault">Theme</label>
 
-        <div i18n class="inner-form-title">SIGNUP</div>
+                <div class="peertube-select-container">
+                  <select formControlName="default" id="themeDefault">
+                    <option i18n value="default">default</option>
 
-        <ng-container formGroupName="signup">
-          <div class="form-group">
-            <my-peertube-checkbox
-              inputName="signupEnabled" formControlName="enabled"
-              i18n-labelText labelText="Signup enabled"
-            >
-              <ng-container ngProjectAs="description">
-                <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
-              </ng-container>
-              <ng-container ngProjectAs="extra">
-                <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }"
-                  inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
-                  i18n-labelText labelText="Signup requires email verification"
-                ></my-peertube-checkbox>
-
-                <div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
-                  <label i18n for="signupLimit">Signup limit</label>
-                  <input
-                    type="number" min="-1" id="signupLimit"
-                    formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
-                  >
-                  <div *ngIf="formErrors.signup.limit" class="form-error">{{ formErrors.signup.limit }}</div>
-                  <small *ngIf="form.value['signup']['limit'] === -1" class="text-muted">Signup won't be limited to a fixed number of users.</small>
+                    <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
+                  </select>
                 </div>
-              </ng-container>
-            </my-peertube-checkbox>
-          </div>
-        </ng-container>
-
-
-        <div i18n class="inner-form-title">USERS</div>
+              </div>
+            </ng-container>
 
-        <ng-container formGroupName="user">
-          <div class="form-group">
-            <label i18n for="userVideoQuota">Default video quota per user</label>
-            <div class="peertube-select-container">
-              <select id="userVideoQuota" formControlName="videoQuota">
-                <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value">
-                  {{ videoQuotaOption.label }}
-                </option>
-              </select>
+            <div class="form-group" formGroupName="instance">
+              <label i18n for="instanceDefaultClientRoute">Landing page</label>
+              <div class="peertube-select-container">
+                <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute">
+                  <option i18n value="/videos/overview">Discover videos</option>
+                  <option i18n value="/videos/trending">Trending videos</option>
+                  <option i18n value="/videos/most-liked">Most liked videos</option>
+                  <option i18n value="/videos/recently-added">Recently added videos</option>
+                  <option i18n value="/videos/local">Local videos</option>
+                </select>
+              </div>
+              <div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
             </div>
-            <div *ngIf="formErrors.user.videoQuota" class="form-error">{{ formErrors.user.videoQuota }}</div>
+
           </div>
+        </div>
 
-          <div class="form-group">
-            <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label>
-            <div class="peertube-select-container">
-              <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily">
-                <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value">
-                  {{ videoQuotaDailyOption.label }}
-                </option>
-              </select>
-            </div>
-            <div *ngIf="formErrors.user.videoQuotaDaily" class="form-error">{{ formErrors.user.videoQuotaDaily }}</div>
+        <div class="form-row mt-4"> <!-- new users grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">NEW USERS</div>
           </div>
-        </ng-container>
 
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div i18n class="inner-form-title">IMPORT</div>
+            <ng-container formGroupName="signup">
+              <div class="form-group">
+                <my-peertube-checkbox
+                  inputName="signupEnabled" formControlName="enabled"
+                  i18n-labelText labelText="Signup enabled"
+                >
+                  <ng-container ngProjectAs="description">
+                    <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                  </ng-container>
+                  <ng-container ngProjectAs="extra">
+                    <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }"
+                      inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
+                      i18n-labelText labelText="Signup requires email verification"
+                    ></my-peertube-checkbox>
 
-        <ng-container formGroupName="import">
-          <ng-container formGroupName="videos">
+                    <div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
+                      <label i18n for="signupLimit">Signup limit</label>
+                      <input
+                        type="number" min="-1" id="signupLimit"
+                        formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
+                      >
+                      <div *ngIf="formErrors.signup.limit" class="form-error">{{ formErrors.signup.limit }}</div>
+                      <small *ngIf="form.value['signup']['limit'] === -1" class="text-muted">Signup won't be limited to a fixed number of users.</small>
+                    </div>
+                  </ng-container>
+                </my-peertube-checkbox>
+              </div>
+            </ng-container>
 
-            <div class="form-group" formGroupName="http">
-              <my-peertube-checkbox
-                inputName="importVideosHttpEnabled" formControlName="enabled"
-                i18n-labelText labelText="Allow import with HTTP URL (i.e. YouTube)"
-              ></my-peertube-checkbox>
-            </div>
+            <ng-container formGroupName="user">
+              <div class="form-group">
+                <label i18n for="userVideoQuota">Default video quota per user</label>
+                <div class="peertube-select-container">
+                  <select id="userVideoQuota" formControlName="videoQuota">
+                    <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value">
+                      {{ videoQuotaOption.label }}
+                    </option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.user.videoQuota" class="form-error">{{ formErrors.user.videoQuota }}</div>
+              </div>
 
-            <div class="form-group" formGroupName="torrent">
-              <my-peertube-checkbox
-                inputName="importVideosTorrentEnabled" formControlName="enabled"
-                i18n-labelText labelText="Allow import with a torrent file or a magnet URI"
-              ></my-peertube-checkbox>
-            </div>
+              <div class="form-group">
+                <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label>
+                <div class="peertube-select-container">
+                  <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily">
+                    <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value">
+                      {{ videoQuotaDailyOption.label }}
+                    </option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.user.videoQuotaDaily" class="form-error">{{ formErrors.user.videoQuotaDaily }}</div>
+              </div>
+            </ng-container>
 
-          </ng-container>
-        </ng-container>
+          </div>
+        </div>
 
+        <div class="form-row mt-4"> <!-- new videos grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">NEW VIDEOS</div>
+          </div>
 
-        <div i18n class="inner-form-title">AUTO-BLACKLIST</div>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <ng-container formGroupName="autoBlacklist">
-          <ng-container formGroupName="videos">
-            <ng-container formGroupName="ofUsers">
+            <ng-container formGroupName="import">
+              <ng-container formGroupName="videos">
+    
+                <div class="form-group" formGroupName="http">
+                  <my-peertube-checkbox
+                    inputName="importVideosHttpEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Allow import with HTTP URL (i.e. YouTube)"
+                  ></my-peertube-checkbox>
+                </div>
 
-              <div class="form-group">
-                <my-peertube-checkbox
-                  inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Blacklist new videos automatically"
-                >
-                <ng-container ngProjectAs="description">
-                  <span i18n>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</span>
-                </ng-container>
-              </my-peertube-checkbox>
-              </div>
+                <div class="form-group" formGroupName="torrent">
+                  <my-peertube-checkbox
+                    inputName="importVideosTorrentEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Allow import with a torrent file or a magnet URI"
+                  ></my-peertube-checkbox>
+                </div>
 
+              </ng-container>
             </ng-container>
-          </ng-container>
-        </ng-container>
-
 
-        <div i18n class="inner-form-title">INSTANCE FOLLOWERS</div>
+            <ng-container formGroupName="autoBlacklist">
+              <ng-container formGroupName="videos">
+                <ng-container formGroupName="ofUsers">
+    
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
+                      i18n-labelText labelText="Blacklist new videos automatically"
+                    >
+                    <ng-container ngProjectAs="description">
+                      <span i18n>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</span>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                  </div>
+    
+                </ng-container>
+              </ng-container>
+            </ng-container>
 
-        <ng-container formGroupName="followers">
-          <ng-container formGroupName="instance">
+          </div>
+        </div>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="followersInstanceEnabled" formControlName="enabled"
-                i18n-labelText labelText="Other instances can follow your instance"
-              ></my-peertube-checkbox>
-            </div>
+        <div class="form-row mt-4"> <!-- federation grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">FEDERATION</div>
+          </div>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="followersInstanceManualApproval" formControlName="manualApproval"
-                i18n-labelText labelText="Manually approve new instance followers"
-              ></my-peertube-checkbox>
-            </div>
-          </ng-container>
-        </ng-container>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div i18n class="inner-form-title">INSTANCE FOLLOWINGS</div>
+            <ng-container formGroupName="followers">
+              <ng-container formGroupName="instance">
 
-        <ng-container formGroupName="followings">
-          <ng-container formGroupName="instance">
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="followersInstanceEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Other instances can follow yours"
+                  ></my-peertube-checkbox>
+                </div>
 
-            <ng-container formGroupName="autoFollowBack">
-              <div class="form-group">
-                <my-peertube-checkbox
-                  inputName="followingsInstanceAutoFollowBackEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Automatically follow other instances that follow you"
-                >
-                  <ng-container ngProjectAs="description">
-                    <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
-                  </ng-container>
-                </my-peertube-checkbox>
-              </div>
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="followersInstanceManualApproval" formControlName="manualApproval"
+                    i18n-labelText labelText="Manually approve new instance followers"
+                  ></my-peertube-checkbox>
+                </div>
+              </ng-container>
             </ng-container>
 
-            <ng-container formGroupName="autoFollowIndex">
-              <div class="form-group">
-                <my-peertube-checkbox
-                  inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Automatically follow instances of the public index"
-                >
-                  <ng-container ngProjectAs="description">
-                    <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
-                  </ng-container>
+            <ng-container formGroupName="followings">
+              <ng-container formGroupName="instance">
+
+                <ng-container formGroupName="autoFollowBack">
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="followingsInstanceAutoFollowBackEnabled" formControlName="enabled"
+                      i18n-labelText labelText="Automatically follow back instances"
+                    >
+                      <ng-container ngProjectAs="description">
+                        <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                      </ng-container>
+                    </my-peertube-checkbox>
+                  </div>
+                </ng-container>
 
-                  <ng-container ngProjectAs="extra">
-                    <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled() }">
-                      <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
-                      <input
-                        type="text" id="followingsInstanceAutoFollowIndexUrl"
-                        formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }"
-                      >
-                      <div *ngIf="formErrors.followings.instance.autoFollowIndex.indexUrl" class="form-error">{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}</div>
-                    </div>
-                  </ng-container>
-                </my-peertube-checkbox>
-              </div>
+                <ng-container formGroupName="autoFollowIndex">
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
+                      i18n-labelText labelText="Automatically follow instances of the public index"
+                    >
+                      <ng-container ngProjectAs="description">
+                        <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                      </ng-container>
+
+                      <ng-container ngProjectAs="extra">
+                        <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled() }">
+                          <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
+                          <input
+                            type="text" id="followingsInstanceAutoFollowIndexUrl"
+                            formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }"
+                          >
+                          <div *ngIf="formErrors.followings.instance.autoFollowIndex.indexUrl" class="form-error">{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}</div>
+                        </div>
+                      </ng-container>
+                    </my-peertube-checkbox>
+                  </div>
 
+                </ng-container>
+              </ng-container>
             </ng-container>
-          </ng-container>
-        </ng-container>
 
+          </div>
+        </div>
+
+        <div class="form-row mt-4"> <!-- administrators grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">ADMINISTRATORS</div>
+          </div>
 
-        <div i18n class="inner-form-title">ADMINISTRATORS</div>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div class="form-group" formGroupName="admin">
-          <label i18n for="adminEmail">Admin email</label>
-          <input
-            type="text" id="adminEmail"
-            formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }"
-          >
-          <div *ngIf="formErrors.admin.email" class="form-error">{{ formErrors.admin.email }}</div>
-        </div>
+            <div class="form-group" formGroupName="admin">
+              <label i18n for="adminEmail">Admin email</label>
+              <input
+                type="text" id="adminEmail"
+                formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }"
+              >
+              <div *ngIf="formErrors.admin.email" class="form-error">{{ formErrors.admin.email }}</div>
+            </div>
+
+            <div class="form-group" formGroupName="contactForm">
+              <my-peertube-checkbox
+                inputName="enableContactForm" formControlName="enabled"
+                i18n-labelText labelText="Enable contact form"
+              ></my-peertube-checkbox>
+            </div>
 
-        <div class="form-group" formGroupName="contactForm">
-          <my-peertube-checkbox
-            inputName="enableContactForm" formControlName="enabled"
-            i18n-labelText labelText="Enable contact form"
-          ></my-peertube-checkbox>
+          </div>
         </div>
 
       </ng-template>
 
     <ngb-tab i18n-title title="Services">
       <ng-template ngbTabContent>
-        <div i18n class="inner-form-title">TWITTER</div>
 
-        <ng-container formGroupName="services">
-          <ng-container formGroupName="twitter">
+        <div class="form-row mt-5"> <!-- twitter grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">TWITTER</div>
+          </div>
 
-            <div class="form-group">
-              <label i18n for="signupLimit">Your Twitter username</label>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>Indicates the Twitter account for the website or platform on which the content was published.</ng-container>
-                </ng-template>
-              </my-help>
+            <ng-container formGroupName="services">
+              <ng-container formGroupName="twitter">
 
-              <input
-                type="text" id="servicesTwitterUsername"
-                formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }"
-              >
-              <div *ngIf="formErrors.services.twitter.username" class="form-error">{{ formErrors.services.twitter.username }}</div>
-            </div>
+                <div class="form-group">
+                  <label i18n for="signupLimit">Your Twitter username</label>
 
-            <div class="form-group">
-              <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
-                <ng-template ptTemplate="label">
-                  <ng-container i18n>Instance whitelisted by Twitter</ng-container>
-                </ng-template>
+                  <my-help>
+                    <ng-template ptTemplate="customHtml">
+                      <ng-container i18n>Indicates the Twitter account for the website or platform on which the content was published.</ng-container>
+                    </ng-template>
+                  </my-help>
 
-                <ng-template ptTemplate="help">
-                  <ng-container i18n>
-                    If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
-                    If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
-                    Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
-                    <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
-                    to see if you instance is whitelisted.
-                  </ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
-            </div>
+                  <input
+                    type="text" id="servicesTwitterUsername"
+                    formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }"
+                  >
+                  <div *ngIf="formErrors.services.twitter.username" class="form-error">{{ formErrors.services.twitter.username }}</div>
+                </div>
 
-          </ng-container>
-        </ng-container>
+                <div class="form-group">
+                  <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
+                    <ng-template ptTemplate="label">
+                      <ng-container i18n>Instance whitelisted by Twitter</ng-container>
+                    </ng-template>
+
+                    <ng-template ptTemplate="help">
+                      <ng-container i18n>
+                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
+                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
+                        Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
+                        <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
+                        to see if you instance is whitelisted.
+                      </ng-container>
+                    </ng-template>
+                  </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+            </ng-container>
+
+          </div>
+        </div>
 
     </ng-template>
     </ngb-tab>
     <ngb-tab i18n-title title="Advanced configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">TRANSCODING</div>
-
-        <ng-container formGroupName="transcoding">
-          <div class="form-group">
-            <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled">
-              <ng-template ptTemplate="label">
-                <ng-container i18n>Transcoding enabled</ng-container>
-              </ng-template>
-
-              <ng-template ptTemplate="help">
-                <ng-container i18n>If you disable transcoding, many videos from your users will not work!</ng-container>
-              </ng-template>
-            </my-peertube-checkbox>
+        <div class="form-row mt-5"> <!-- transcoding grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">TRANSCODING</div>
           </div>
 
-          <ng-container *ngIf="isTranscodingEnabled()">
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
-                i18n-labelText labelText="Allow additional extensions"
-              >
-                <ng-template ptTemplate="help">
-                  <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
-            </div>
-
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
-                i18n-labelText labelText="Allow audio files upload"
-              >
-                <ng-template ptTemplate="help">
-                  <ng-container i18n>Allow your users to upload audio files that will be merged with the preview file on upload</ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
-            </div>
+            <ng-container formGroupName="transcoding">
 
-            <ng-container formGroupName="webtorrent">
-              <div class="form-group" >
-                <my-peertube-checkbox
-                  inputName="transcodingWebTorrentEnabled" formControlName="enabled"
-                  i18n-labelText labelText="WebTorrent support enabled"
-                >
+              <div class="form-group">
+                <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled">
+                  <ng-template ptTemplate="label">
+                    <ng-container i18n>Transcoding enabled</ng-container>
+                  </ng-template>
+    
                   <ng-template ptTemplate="help">
-                    <ng-container i18n>
-                      <strong>Experimental, we suggest you to not disable webtorrent support for now</strong>
+                    <ng-container i18n>If you disable transcoding, many videos from your users will not work!</ng-container>
+                  </ng-template>
 
-                      <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
+                  <ng-container ngProjectAs="extra">
 
-                      <br />
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                      <my-peertube-checkbox
+                        inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
+                        i18n-labelText labelText="Allow additional extensions"
+                      >
+                        <ng-template ptTemplate="help">
+                          <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container>
+                        </ng-template>
+                      </my-peertube-checkbox>
+                    </div>
+    
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                      <my-peertube-checkbox
+                        inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
+                        i18n-labelText labelText="Allow audio files upload"
+                      >
+                        <ng-template ptTemplate="help">
+                          <ng-container i18n>Allow your users to upload audio files that will be merged with the preview file on upload</ng-container>
+                        </ng-template>
+                      </my-peertube-checkbox>
+                    </div>
 
-                      <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
+                    <ng-container formGroupName="webtorrent">
+                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <my-peertube-checkbox
+                          inputName="transcodingWebTorrentEnabled" formControlName="enabled"
+                          i18n-labelText labelText="WebTorrent support enabled"
+                        >
+                          <ng-template ptTemplate="help">
+                            <ng-container i18n>
+                              <strong>Experimental, we suggest you to not disable webtorrent support for now</strong>
+    
+                              <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
+
+                              <br />
+
+                              <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
+                            </ng-container>
+                          </ng-template>
+                        </my-peertube-checkbox>
+                      </div>
                     </ng-container>
-                  </ng-template>
+
+                    <ng-container formGroupName="hls">
+                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <my-peertube-checkbox
+                          inputName="transcodingHlsEnabled" formControlName="enabled"
+                          i18n-labelText labelText="HLS support enabled"
+                        >
+                          <ng-template ptTemplate="help">
+                            <ng-container i18n>
+                              <strong>Requires ffmpeg >= 4.1</strong>
+    
+                              <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
+                              <ul>
+                                <li>Resolution change is smoother</li>
+                                <li>Faster playback in particular with long videos</li>
+                                <li>More stable playback (less bugs/infinite loading)</li>
+                              </ul>
+    
+                              <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
+                            </ng-container>
+                          </ng-template>
+                        </my-peertube-checkbox>
+                      </div>
+                    </ng-container>
+    
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                      <label i18n for="transcodingThreads">Transcoding threads</label>
+                      <div class="peertube-select-container">
+                        <select id="transcodingThreads" formControlName="threads">
+                          <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
+                            {{ transcodingThreadOption.label }}
+                          </option>
+                        </select>
+                      </div>
+                      <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
+                    </div>
+    
+                    <ng-container formGroupName="resolutions">
+                      <div class="form-group" *ngFor="let resolution of resolutions" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <my-peertube-checkbox
+                          [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                          i18n-labelText labelText="Resolution {{resolution.label}} enabled"
+                        >
+                          <ng-template *ngIf="resolution.description" ptTemplate="help">
+                            <div [innerHTML]="resolution.description"></div>
+                          </ng-template>
+                        </my-peertube-checkbox>
+                      </div>
+                    </ng-container>
+
+                  </ng-container>
                 </my-peertube-checkbox>
               </div>
+
             </ng-container>
 
-            <ng-container formGroupName="hls">
-              <div class="form-group" >
-                <my-peertube-checkbox
-                  inputName="transcodingHlsEnabled" formControlName="enabled"
-                  i18n-labelText labelText="HLS support enabled"
-                >
-                  <ng-template ptTemplate="help">
-                    <ng-container i18n>
-                      <strong>Requires ffmpeg >= 4.1</strong>
+          </div>
+        </div>
 
-                      <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
-                      <ul>
-                        <li>Resolution change is smoother</li>
-                        <li>Faster playback in particular with long videos</li>
-                        <li>More stable playback (less bugs/infinite loading)</li>
-                      </ul>
+        <div class="form-row mt-4"> <!-- cache grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div class="inner-form-title">
+              <ng-container i18n>CACHE</ng-container>
+              <my-help>
+                <ng-template ptTemplate="customHtml">
+                  <ng-container i18n>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</ng-container>
+                </ng-template>
+              </my-help>
+            </div>
+          </div>
 
-                      <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
-                    </ng-container>
-                  </ng-template>
-                </my-peertube-checkbox>
-              </div>
-            </ng-container>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-            <div class="form-group">
-              <label i18n for="transcodingThreads">Transcoding threads</label>
-              <div class="peertube-select-container">
-                <select id="transcodingThreads" formControlName="threads">
-                  <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
-                    {{ transcodingThreadOption.label }}
-                  </option>
-                </select>
+            <ng-container formGroupName="cache">
+              <div class="form-group" formGroupName="previews">
+                <label i18n for="cachePreviewsSize">Number of previews to keep in cache</label>
+                <input
+                  type="number" min="0" id="cachePreviewsSize"
+                  formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.previews.size'] }"
+                >
+                <div *ngIf="formErrors.cache.previews.size" class="form-error">{{ formErrors.cache.previews.size }}</div>
               </div>
-              <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
-            </div>
 
-            <ng-container formGroupName="resolutions">
-              <div class="form-group" *ngFor="let resolution of resolutions">
-                <my-peertube-checkbox
-                  [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
-                  i18n-labelText labelText="Resolution {{resolution.label}} enabled"
+              <div class="form-group" formGroupName="captions">
+                <label i18n for="cacheCaptionsSize">Number of video captions to keep in cache</label>
+                <input
+                  type="number" min="0" id="cacheCaptionsSize"
+                  formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.captions.size'] }"
                 >
-                  <ng-template *ngIf="resolution.description" ptTemplate="help">
-                    <div [innerHTML]="resolution.description"></div>
-                  </ng-template>
-                </my-peertube-checkbox>
+                <div *ngIf="formErrors.cache.captions.size" class="form-error">{{ formErrors.cache.captions.size }}</div>
               </div>
             </ng-container>
 
-          </ng-container>
-        </ng-container>
-
-        <div class="inner-form-title">
-          <ng-container i18n>CACHE</ng-container>
-
-          <my-help>
-            <ng-template ptTemplate="customHtml">
-              <ng-container i18n>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</ng-container>
-            </ng-template>
-          </my-help>
-        </div>
-
-        <ng-container formGroupName="cache">
-          <div class="form-group" formGroupName="previews">
-            <label i18n for="cachePreviewsSize">Previews cache size</label>
-            <input
-              type="text" id="cachePreviewsSize"
-              formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.previews.size'] }"
-            >
-            <div *ngIf="formErrors.cache.previews.size" class="form-error">{{ formErrors.cache.previews.size }}</div>
           </div>
+        </div>
 
-          <div class="form-group" formGroupName="captions">
-            <label i18n for="cacheCaptionsSize">Video captions cache size</label>
-            <input
-              type="text" id="cacheCaptionsSize"
-              formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.captions.size'] }"
-            >
-            <div *ngIf="formErrors.cache.captions.size" class="form-error">{{ formErrors.cache.captions.size }}</div>
+        <div class="form-row mt-4"> <!-- cache grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
           </div>
-        </ng-container>
 
-        <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
-
-        <ng-container formGroupName="instance">
-          <ng-container formGroupName="customizations">
-            <div class="form-group">
-              <label i18n for="customizationJavascript">JavaScript</label>
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>
-                    Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre>
-                  </ng-container>
-                </ng-template>
-              </my-help>
-
-              <textarea
-                id="customizationJavascript" formControlName="javascript"
-                [ngClass]="{ 'input-error': formErrors['instance.customizations.javascript'] }"
-              ></textarea>
-
-              <div *ngIf="formErrors.instance.customizations.javascript" class="form-error">{{ formErrors.instance.customizations.javascript }}</div>
-            </div>
-
-            <div class="form-group">
-              <label for="customizationCSS">CSS</label>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="instance">
+              <ng-container formGroupName="customizations">
+                <div class="form-group">
+                  <label i18n for="customizationJavascript">JavaScript</label>
+                  <my-help>
+                    <ng-template ptTemplate="customHtml">
+                      <ng-container i18n>
+                        Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre>
+                      </ng-container>
+                    </ng-template>
+                  </my-help>
+
+                  <textarea
+                    id="customizationJavascript" formControlName="javascript"
+                    [ngClass]="{ 'input-error': formErrors['instance.customizations.javascript'] }"
+                  ></textarea>
+
+                  <div *ngIf="formErrors.instance.customizations.javascript" class="form-error">{{ formErrors.instance.customizations.javascript }}</div>
+                </div>
 
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>
-                    Write CSS code directly. Example:<br /><br />
-<pre>
-#custom-css {{ '{' }}
-  color: red;
-{{ '}' }}
-</pre>
-
-                    Prepend with <em>#custom-css</em> to override styles. Example:<br /><br />
-<pre>
-#custom-css .logged-in-email {{ '{' }}
-  color: red;
-{{ '}' }}
-</pre>
-                  </ng-container>
-                </ng-template>
-              </my-help>
+                <div class="form-group">
+                  <label for="customizationCSS">CSS</label>
+
+                  <my-help>
+                    <ng-template ptTemplate="customHtml">
+                      <ng-container i18n>
+                        Write CSS code directly. Example:<br /><br />
+    <pre>
+    #custom-css {{ '{' }}
+      color: red;
+    {{ '}' }}
+    </pre>
+                        Prepend with <em>#custom-css</em> to override styles. Example:<br /><br />
+    <pre>
+    #custom-css .logged-in-email {{ '{' }}
+      color: red;
+    {{ '}' }}
+    </pre>
+                      </ng-container>
+                    </ng-template>
+                  </my-help>
+
+                  <textarea
+                    id="customizationCSS" formControlName="css"
+                    [ngClass]="{ 'input-error': formErrors['instance.customizations.css'] }"
+                  ></textarea>
+                  <div *ngIf="formErrors.instance.customizations.css" class="form-error">{{ formErrors.instance.customizations.css }}</div>
+                </div>
+              </ng-container>
+            </ng-container>
 
-              <textarea
-                id="customizationCSS" formControlName="css"
-                [ngClass]="{ 'input-error': formErrors['instance.customizations.css'] }"
-              ></textarea>
-              <div *ngIf="formErrors.instance.customizations.css" class="form-error">{{ formErrors.instance.customizations.css }}</div>
-            </div>
-          </ng-container>
-        </ng-container>
+          </div>
+        </div>
 
       </ng-template>
     </ngb-tab>
   </ngb-tabset>
 
-  <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
-  <span class="form-error" i18n *ngIf="!form.valid">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</span>
+  <div class="form-row mt-4"> <!-- submit placement block -->
+    <div class="col-md-7 col-xl-5"></div>
+    <div class="col-md-5 col-xl-5">
+      <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
+      <span class="form-error" i18n *ngIf="!form.valid">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</span>
+    </div>
+  </div>
 </form>
index dd70f1c0664a91420293cb1600243c9f4414d48c..8b1cdcbbad7ff50b2f3282886e6e1f0507a8215c 100644 (file)
@@ -1,12 +1,19 @@
 @import '_variables';
 @import '_mixins';
 
-.form-group {
-  margin-bottom: 25px;
+$form-base-input-width: 340px;
+
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
+form {
+  padding-bottom: 1.5rem;
 }
 
 input[type=text] {
-  @include peertube-input-text(340px);
+  @include peertube-input-text($form-base-input-width);
   display: block;
 }
 
@@ -20,14 +27,15 @@ input[type=checkbox] {
 }
 
 .peertube-select-container {
-  @include peertube-select-container(340px);
+  @include peertube-select-container($form-base-input-width);
 }
 
 input[type=submit] {
   @include peertube-button;
   @include orange-button;
 
-  margin-top: 20px;
+  display: flex;
+  margin-left: auto;
 
   & + .form-error {
     display: inline;
@@ -36,12 +44,7 @@ input[type=submit] {
 }
 
 .inner-form-title {
-  text-transform: uppercase;
-  color: var(--mainColor);
-  font-weight: $font-bold;
-  font-size: 13px;
-  margin-top: 30px;
-  margin-bottom: 10px;
+  @include settings-big-title;
 }
 
 textarea {
@@ -63,3 +66,21 @@ textarea {
   opacity: .5;
   pointer-events: none;
 }
+
+my-markdown-textarea ::ng-deep {
+  .root {
+    @media screen and (max-width: 1400px) {
+      flex-direction: column !important;
+    }
+  }
+}
+
+.form-group-right {
+  padding-top: 2px;
+}
+
+ngb-tabset:not(.previews) ::ng-deep {
+  .nav-link {
+    font-size: 105%;
+  }
+}
\ No newline at end of file
index 3d3b6dd1278f9c06f04e67591e0be7ca17cd535e..56ea91d0be7e35aa5a77c3938fb210bc9f6e266c 100644 (file)
         font-weight: 600;
       }
 
+      .ui-button.ui-state-default {
+        background-color: #f0f0f0;
+        border: 1px solid #f0f0f0;
+      }
+
       .ui-button.ui-state-active {
         background-color: var(--mainColor);
         border-color: var(--mainColor);
+
+        &:hover {
+          background-color: var(--mainHoverColor);
+          border-color: var(--mainHoverColor);
+        }
+      }
+
+      .ui-button:not(.ui-state-active).ui-state-focus {
+        box-shadow: 0 0 0 .1rem rgba(87, 85, 217, .2);
       }
     }
   }
index 81eba3ec9c7d7af7ecc41db6d6687333aaf37d93..aec709ea028531478aced19d9a4bce098cc73b04 100644 (file)
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
 input[type=password],
 input[type=email] {
   @include peertube-input-text(340px);
@@ -16,7 +21,7 @@ input[type=submit] {
 .current-email,
 .pending-email {
   font-size: 16px;
-  margin: 15px 0;
+  margin-bottom: 15px;
 
   .email {
     font-weight: $font-semibold;
index e641482f059eb48d5a7f52bcbe9e7ecad812ea61..381afae078f40ad7c2c1236b9612df433a2ae97e 100644 (file)
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
 input[type=password] {
   @include peertube-input-text(340px);
   display: block;
index c542cc6759b34a020373952251955eea051f21e3..dd9b565851e0e1c375f2abe6e535491d02455472 100644 (file)
@@ -1,5 +1,5 @@
 <div class="delete-me">
-  <p i18n>Once you delete your account, there is no going back. Please be certain.</p>
+  <p i18n>Once you delete your account, there is no going back.</p>
 
   <button (click)="deleteMe()" i18n>Delete your account</button>
 </div>
\ No newline at end of file
index 629f017334a921672299836760e4d59b7d14b24c..7818dfc02deecfd24e5133590e701d7ac4c34f60 100644 (file)
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
 input[type=submit] {
   @include peertube-button;
   @include orange-button;
index 05c0b5ddc421dc3ad69650f8184467fc92b95d0e..14e51f57cf65fbc8d871c47821a91d67c495534c 100644 (file)
@@ -24,5 +24,5 @@
     </div>
   </div>
 
-  <input type="submit" i18n-value value="Update my profile" [disabled]="!form.valid">
+  <input type="submit" i18n-value value="Save" [disabled]="!form.valid">
 </form>
index 6aabb60f4fb020072c029fe1c48fe3f8d134fe76..2f8df81d40667f9f829fbc27f1e5b08c09219d89 100644 (file)
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
 .form-group:first-child {
   margin-bottom: 15px;
 }
@@ -11,12 +16,6 @@ input[type=text] {
   display: block;
 }
 
-textarea {
-  @include peertube-textarea(500px, 150px);
-
-  display: block;
-}
-
 input[type=submit] {
   @include peertube-button;
   @include orange-button;
@@ -24,3 +23,8 @@ input[type=submit] {
   margin-top: 15px;
 }
 
+textarea {
+  @include peertube-textarea(500px, 150px);
+
+  display: block;
+}
index 9f187b57483cad7a178a2c2c7489ba7ada474367..164afb4ea329137580641e3a672059baa9fa087c 100644 (file)
@@ -1,34 +1,83 @@
-<my-actor-avatar-info [actor]="user.account" (avatarChange)="onAvatarChange($event)"></my-actor-avatar-info>
+<div class="form-row"> <!-- profile grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">PROFILE</div>
+  </div>
+
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-actor-avatar-info [actor]="user.account" (avatarChange)="onAvatarChange($event)"></my-actor-avatar-info>
+
+    <div class="user-quota mb-3">
+      <div>
+        <label i18n>Total video quota:</label>
+        <ng-container i18n>{{ userVideoQuotaUsed | bytes: 0 }} used</ng-container> / {{ userVideoQuota }}
+      </div>
+
+      <div *ngIf="hasDailyQuota()">
+        <label i18n>Daily video quota:</label>
+        <ng-container>{{ userVideoQuotaUsedDaily | bytes: 0 }} used</ng-container> / {{ userVideoQuotaDaily }}
+      </div>
+    </div>
+
+    <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
+  </div>
+</div>
 
-<div class="user-quota">
-  <div>
-    <span i18n class="user-quota-label">Total video quota:</span>
-    <ng-container i18n>{{ userVideoQuotaUsed | bytes: 0 }} used</ng-container> / {{ userVideoQuota }}
+<div class="form-row mt-5"> <!-- video settings grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">VIDEO SETTINGS</div>
   </div>
 
-  <div *ngIf="hasDailyQuota()">
-    <span i18n class="user-quota-label">Daily video quota:</span>
-    <ng-container>{{ userVideoQuotaUsedDaily | bytes: 0 }} used</ng-container> / {{ userVideoQuotaDaily }}
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-video-settings>
   </div>
 </div>
 
-<div i18n class="account-title">Profile</div>
-<my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
+<div class="form-row mt-5"> <!-- notifications grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">NOTIFICATIONS</div>
+  </div>
 
-<div i18n class="account-title">Video settings</div>
-<my-account-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-video-settings>
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences>
+  </div>
+</div>
 
-<div i18n class="account-title">Notifications</div>
-<my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences>
+<div class="form-row mt-5"> <!-- interface grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">INTERFACE</div>
+  </div>
 
-<div i18n class="account-title">Interface</div>
-<my-account-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-interface-settings>
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-interface-settings>
+  </div>
+</div>
 
-<div i18n class="account-title">Password</div>
-<my-account-change-password></my-account-change-password>
+<div class="form-row mt-5"> <!-- password grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">PASSWORD</div>
+  </div>
+
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-change-password></my-account-change-password>
+  </div>
+</div>
+
+<div class="form-row mt-5"> <!-- email grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">EMAIL</div>
+  </div>
 
-<div i18n class="account-title">Email</div>
-<my-account-change-email></my-account-change-email>
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-change-email></my-account-change-email>
+  </div>
+</div>
+
+<div class="form-row mt-5"> <!-- danger zone grid -->
+  <div class="form-group col-12 col-lg-4 col-xl-3">
+    <div i18n class="account-title">DANGER ZONE</div>
+  </div>
 
-<div i18n class="account-title">Danger zone</div>
-<my-account-danger-zone [user]="user"></my-account-danger-zone>
+  <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <my-account-danger-zone [user]="user"></my-account-danger-zone>
+  </div>
+</div>
index d0395aca9f8bdd801a96d967ddfbdd90377d2c30..7eb60c7fbbd0a88182c1bb284e3839b18608685b 100644 (file)
@@ -5,15 +5,11 @@
   font-size: 15px;
   margin-top: 20px;
 
-  .user-quota-label {
+  label {
     margin-right: 5px;
-    font-weight: $font-semibold;
   }
 }
 
 .account-title {
-  @include in-content-small-title;
-
-  margin-top: 55px;
-  margin-bottom: 30px;
+  @include settings-big-title;
 }
index 1881be762605734c80434a9ad1060ce3aa6329cd..56cef0398c781461ae38b0c9a4767908487021e0 100644 (file)
@@ -1,6 +1,11 @@
 @import '_variables';
 @import '_mixins';
 
+label {
+  font-weight: $font-regular;
+  font-size: 100%;
+}
+
 input[type=submit] {
   @include peertube-button;
   @include orange-button;
index 8e034bb825632cdd0e82c3013e122b0883a7e9e0..eb198587d5f0186294aaa346d4c79974b8191d2d 100644 (file)
@@ -48,6 +48,6 @@ export class ActorAvatarInfoComponent implements OnInit {
   }
 
   get avatarExtensions () {
-    return this.serverConfig.avatar.file.extensions.join(',')
+    return this.serverConfig.avatar.file.extensions.join(', ')
   }
 }
index eacaf36a21a7e42dbb26e3b98b4cb230daa808b8..bd02343de264290be67bd51849f6347a8c9f180e 100644 (file)
@@ -22,6 +22,8 @@
       align-items: center;
       height: 30px !important;
       padding: 0 15px !important;
+      font-size: 85% !important;
+      opacity: .7;
     }
 
     .tab-content {
index 35511ee628ae9bf820ab76870e6f2be1d6bbcfb6..3087b2e987c87d9ae8b07ec9b1afae8788cac3d8 100644 (file)
@@ -1,12 +1,12 @@
 <div class="sub-menu">
   <ng-container *ngFor="let menuEntry of menuEntries">
 
-    <a *ngIf="menuEntry.routerLink" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page">{{ menuEntry.label }}</a>
+    <a *ngIf="menuEntry.routerLink" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ menuEntry.label }}</a>
 
     <div *ngIf="!menuEntry.routerLink" ngbDropdown [container]="container" class="parent-entry" #dropdown="ngbDropdown" (mouseleave)="closeDropdownIfHovered(dropdown)">
       <span
         (mouseenter)="openDropdownOnHover(dropdown)" [ngClass]="{ active: !!suffixLabels[menuEntry.label] }" ngbDropdownAnchor
-        (click)="dropdownAnchorClicked(dropdown)" role="button" class="title-page"
+        (click)="dropdownAnchorClicked(dropdown)" role="button" class="title-page title-page-settings"
       >
         <ng-container i18n>{{ menuEntry.label }}</ng-container>
         <ng-container *ngIf="!!suffixLabels[menuEntry.label]"> - {{ suffixLabels[menuEntry.label] }}</ng-container>
index 046368c8b71a392c6efc3af1c4bad9ef7124a78f..a9475e484c3bc1fb323918e3015f03f9d79bf455 100644 (file)
@@ -174,6 +174,16 @@ label {
   }
 }
 
+.title-page-about,
+.title-page-settings {
+  font-size: 115%;
+  font-weight: $font-regular;
+
+  &.active {
+    font-weight: $font-semibold;
+  }
+}
+
 .admin-sub-header {
   display: flex;
   align-items: center;
index f718791eba1420df462420ec059f2336e342d118..5c1ce1028b6515214f39e8d1e0aece4108c1a25b 100644 (file)
@@ -175,10 +175,10 @@ ngb-tabset {
 
 .nav-tabs .nav-link {
   &:not(.active) {
-    opacity: .6;
     border-bottom: 3px solid transparent;
   }
   &.active {
+    font-weight: $font-semibold;
     background-color: var(--mainBackgroundColor) !important;
     border: none;
     border-bottom: 2px solid var(--mainColor);
index 9a8d0073a85959fb2e6074c3307c6740e07c0143..0a500b6f36823024ded87bbea19408ee4150b4e8 100644 (file)
   font-size: 13px;
 }
 
+@mixin settings-big-title {
+  text-transform: uppercase;
+  color: var(--mainColor);
+  font-weight: $font-bold;
+  font-size: 110%;
+  margin-bottom: 10px;
+}
+
 @mixin actor-owner {
   @include disable-default-a-behaviour;
 
index 3260c62fc6c42939d0fe8977e2a7b03d932ef1a9..1a8b191366a94f8604d1fa28820c6e517424ec92 100644 (file)
@@ -249,7 +249,7 @@ auto_blacklist:
 
 instance:
   name: 'PeerTube'
-  short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.'
+  short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
   description: 'Welcome to this PeerTube instance!' # Support markdown
   terms: 'No terms for now.' # Support markdown
   code_of_conduct: '' # Supports markdown
index 64252545549ae62fa29b9481d65f48fb65d5c481..1d81e1dce2645cac525c3843aaaf24d06e2f92b6 100644 (file)
@@ -27,8 +27,7 @@ const expect = chai.expect
 function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
   expect(data.instance.name).to.equal('PeerTube')
   expect(data.instance.shortDescription).to.equal(
-    'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' +
-    'with WebTorrent and Angular.'
+    'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
   )
   expect(data.instance.description).to.equal('Welcome to this PeerTube instance!')
 
index d61724e5116f0b5d9081316b66375f10f96bf926..670bc67016927c9541c157822ea85b362c5e0bd7 100644 (file)
@@ -112,8 +112,7 @@ describe('Test a client controllers', function () {
   it('Should have valid index html tags (title, description...)', async function () {
     const res = await makeHTMLRequest(server.url, '/videos/trending')
 
-    const description = 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser ' +
-      'with WebTorrent and Angular.'
+    const description = 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
     checkIndexTags(res.text, 'PeerTube', description, '')
   })