From 76314386aeafdd6849b7b70c517779d6b2013473 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 27 Mar 2020 15:19:03 +0100
Subject: Add overview of a user's actions in user-edit (#2558)

---
 .../config/edit-custom-config/edit-custom-config.component.html      | 4 ++--
 .../config/edit-custom-config/edit-custom-config.component.scss      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'client/src/app/+admin/config')

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 b3b4f7728..9991e1f63 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
@@ -579,7 +579,7 @@
                         i18n-labelText labelText="Allow additional extensions"
                       >
                         <ng-container ngProjectAs="description">
-                          <span i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos.</span>
+                          <span i18n>Allows users to upload .mkv, .mov, .avi and .flv videos.</span>
                         </ng-container>
                       </my-peertube-checkbox>
                     </div>
@@ -590,7 +590,7 @@
                         i18n-labelText labelText="Allow audio files upload"
                       >
                         <ng-container ngProjectAs="description">
-                          <span i18n>Allow your users to upload audio files that will be merged with the preview file on upload.</span>
+                          <span i18n>Allows users to upload audio files that will be merged with the preview file on upload.</span>
                         </ng-container>
                       </my-peertube-checkbox>
                     </div>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 8b1cdcbba..d8bc30d55 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -50,6 +50,7 @@ input[type=submit] {
 textarea {
   @include peertube-textarea(500px, 150px);
 
+  max-width: 100%;
   display: block;
 
   &.small {
@@ -72,6 +73,10 @@ my-markdown-textarea ::ng-deep {
     @media screen and (max-width: 1400px) {
       flex-direction: column !important;
     }
+
+    textarea {
+      max-width: 100%;
+    }
   }
 }
 
-- 
cgit v1.2.3