aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-14 14:18:13 +0200
committerChocobozzz <me@florianbigard.com>2021-05-14 14:18:13 +0200
commit5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d (patch)
treef4d7f184593e6e025b71cbe7cb4ea8583fd267b0 /client/src/app
parentaea0b0e7cde7495e60fe07b4444067f53d35ce3f (diff)
parentcb4bab61c19f2be7858f9cc6e8e234f04b1d504f (diff)
downloadPeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.tar.gz
PeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.tar.zst
PeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.zip
Merge branch 'release/3.2.0' into develop
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html2
-rw-r--r--client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index 84a793ae4..b7fac176d 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -100,7 +100,7 @@
100 <div class="peertube-select-container"> 100 <div class="peertube-select-container">
101 <select id="broadcastMessageLevel" formControlName="level" class="form-control"> 101 <select id="broadcastMessageLevel" formControlName="level" class="form-control">
102 <option value="info">info</option> 102 <option value="info">info</option>
103 <option value="warning">warning</option> 103 <option value="warn">warning</option>
104 <option value="error">error</option> 104 <option value="error">error</option>
105 </select> 105 </select>
106 </div> 106 </div>
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
index 8c12d3c4c..08372d8ad 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
+++ b/client/src/app/shared/shared-actor-image-edit/actor-banner-edit.component.ts
@@ -42,7 +42,7 @@ export class ActorBannerEditComponent implements OnInit {
42 this.bannerExtensions = config.banner.file.extensions.join(', ') 42 this.bannerExtensions = config.banner.file.extensions.join(', ')
43 43
44 // tslint:disable:max-line-length 44 // tslint:disable:max-line-length
45 this.bannerFormat = $localize`ratio 6/1, recommended size: 1600x266, max size: ${getBytes(this.maxBannerSize)}, extensions: ${this.bannerExtensions}` 45 this.bannerFormat = $localize`ratio 6/1, recommended size: 1920x317, max size: ${getBytes(this.maxBannerSize)}, extensions: ${this.bannerExtensions}`
46 }) 46 })
47 } 47 }
48 48