aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html6
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts5
-rw-r--r--client/src/app/menu/menu.component.html4
-rw-r--r--client/src/app/shared/forms/peertube-checkbox.component.scss3
-rw-r--r--client/src/app/shared/misc/help.component.scss2
-rw-r--r--client/src/sass/include/_mixins.scss2
-rw-r--r--client/src/sass/primeng-custom.scss4
7 files changed, 20 insertions, 6 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 82f467e16..8d6c9ab5b 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -549,7 +549,11 @@
549 <my-peertube-checkbox 549 <my-peertube-checkbox
550 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id" 550 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
551 i18n-labelText labelText="Resolution {{resolution.label}} enabled" 551 i18n-labelText labelText="Resolution {{resolution.label}} enabled"
552 ></my-peertube-checkbox> 552 >
553 <ng-template *ngIf="resolution.description" ptTemplate="help">
554 <div i18n [innerHTML]="resolution.description"></div>
555 </ng-template>
556 </my-peertube-checkbox>
553 </div> 557 </div>
554 </ng-container> 558 </ng-container>
555 559
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 25e06d8a1..ed9c3247c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -18,7 +18,7 @@ import { ServerConfig } from '@shared/models'
18export class EditCustomConfigComponent extends FormReactive implements OnInit { 18export class EditCustomConfigComponent extends FormReactive implements OnInit {
19 customConfig: CustomConfig 19 customConfig: CustomConfig
20 20
21 resolutions: { id: string, label: string }[] = [] 21 resolutions: { id: string, label: string, description?: string }[] = []
22 transcodingThreadOptions: { label: string, value: number }[] = [] 22 transcodingThreadOptions: { label: string, value: number }[] = []
23 23
24 languageItems: SelectItem[] = [] 24 languageItems: SelectItem[] = []
@@ -40,7 +40,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
40 this.resolutions = [ 40 this.resolutions = [
41 { 41 {
42 id: '0p', 42 id: '0p',
43 label: this.i18n('Audio-only') 43 label: this.i18n('Audio-only'),
44 description: `A <code>.mp4</code> that keeps the original audio track, with no video`
44 }, 45 },
45 { 46 {
46 id: '240p', 47 id: '240p',
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 848f9949f..675fb597d 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -31,6 +31,10 @@
31 31
32 <div class="dropdown-divider"></div> 32 <div class="dropdown-divider"></div>
33 33
34 <a class="dropdown-item" href="https://joinpeertube.org/help" target="_blank" rel="noopener noreferrer">
35 <my-global-icon iconName="help"></my-global-icon> <ng-container i18n>Help</ng-container>
36 </a>
37
34 <a (click)="logout($event)" class="dropdown-item" href="#"> 38 <a (click)="logout($event)" class="dropdown-item" href="#">
35 <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container> 39 <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container>
36 </a> 40 </a>
diff --git a/client/src/app/shared/forms/peertube-checkbox.component.scss b/client/src/app/shared/forms/peertube-checkbox.component.scss
index 51f98b0bc..3b467d49d 100644
--- a/client/src/app/shared/forms/peertube-checkbox.component.scss
+++ b/client/src/app/shared/forms/peertube-checkbox.component.scss
@@ -6,6 +6,7 @@
6 6
7 .form-group-checkbox { 7 .form-group-checkbox {
8 display: flex; 8 display: flex;
9 align-items: center;
9 10
10 .label-text { 11 .label-text {
11 font-weight: $font-regular; 12 font-weight: $font-regular;
@@ -23,6 +24,6 @@
23 24
24 my-help { 25 my-help {
25 position: relative; 26 position: relative;
26 top: -2px; 27 top: 2px;
27 } 28 }
28} 29}
diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss
index 84e176b34..f55a516e4 100644
--- a/client/src/app/shared/misc/help.component.scss
+++ b/client/src/app/shared/misc/help.component.scss
@@ -26,7 +26,7 @@
26 font-size: 13px; 26 font-size: 13px;
27 background-color: var(--mainBackgroundColor); 27 background-color: var(--mainBackgroundColor);
28 color: var(--mainForegroundColor); 28 color: var(--mainForegroundColor);
29 box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); 29 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
30 30
31 p { 31 p {
32 margin-bottom: 0; 32 margin-bottom: 0;
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 17217283e..88cbf3384 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -337,7 +337,7 @@
337 position: absolute; 337 position: absolute;
338 338
339 &:focus + span { 339 &:focus + span {
340 outline: 1px solid #1e5180; 340 box-shadow: 0 0 0 .1rem rgba(87, 85, 217, .2);
341 } 341 }
342 342
343 & + span { 343 & + span {
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 9398f0adc..9aa4d980c 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -330,6 +330,10 @@ p-calendar .ui-datepicker {
330 } 330 }
331} 331}
332 332
333p-tablecheckbox:hover div .ui-chkbox-box {
334 box-shadow: 0 0 0 .1rem rgba(87, 85, 217, .2);
335}
336
333.ui-chkbox { 337.ui-chkbox {
334 338
335 &, .ui-chkbox-box { 339 &, .ui-chkbox-box {