diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-03-27 15:19:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-27 15:19:03 +0100 |
commit | 76314386aeafdd6849b7b70c517779d6b2013473 (patch) | |
tree | f0ba33e0f6e7b2eb99222a9eb5b85846cf309ab1 /client/src/app/+admin/config | |
parent | 56d72521ec139dfc0aef083b8541a5b16d974ac1 (diff) | |
download | PeerTube-76314386aeafdd6849b7b70c517779d6b2013473.tar.gz PeerTube-76314386aeafdd6849b7b70c517779d6b2013473.tar.zst PeerTube-76314386aeafdd6849b7b70c517779d6b2013473.zip |
Add overview of a user's actions in user-edit (#2558)
Diffstat (limited to 'client/src/app/+admin/config')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 4 | ||||
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss | 5 |
2 files changed, 7 insertions, 2 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 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 @@ | |||
579 | i18n-labelText labelText="Allow additional extensions" | 579 | i18n-labelText labelText="Allow additional extensions" |
580 | > | 580 | > |
581 | <ng-container ngProjectAs="description"> | 581 | <ng-container ngProjectAs="description"> |
582 | <span i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos.</span> | 582 | <span i18n>Allows users to upload .mkv, .mov, .avi and .flv videos.</span> |
583 | </ng-container> | 583 | </ng-container> |
584 | </my-peertube-checkbox> | 584 | </my-peertube-checkbox> |
585 | </div> | 585 | </div> |
@@ -590,7 +590,7 @@ | |||
590 | i18n-labelText labelText="Allow audio files upload" | 590 | i18n-labelText labelText="Allow audio files upload" |
591 | > | 591 | > |
592 | <ng-container ngProjectAs="description"> | 592 | <ng-container ngProjectAs="description"> |
593 | <span i18n>Allow your users to upload audio files that will be merged with the preview file on upload.</span> | 593 | <span i18n>Allows users to upload audio files that will be merged with the preview file on upload.</span> |
594 | </ng-container> | 594 | </ng-container> |
595 | </my-peertube-checkbox> | 595 | </my-peertube-checkbox> |
596 | </div> | 596 | </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] { | |||
50 | textarea { | 50 | textarea { |
51 | @include peertube-textarea(500px, 150px); | 51 | @include peertube-textarea(500px, 150px); |
52 | 52 | ||
53 | max-width: 100%; | ||
53 | display: block; | 54 | display: block; |
54 | 55 | ||
55 | &.small { | 56 | &.small { |
@@ -72,6 +73,10 @@ my-markdown-textarea ::ng-deep { | |||
72 | @media screen and (max-width: 1400px) { | 73 | @media screen and (max-width: 1400px) { |
73 | flex-direction: column !important; | 74 | flex-direction: column !important; |
74 | } | 75 | } |
76 | |||
77 | textarea { | ||
78 | max-width: 100%; | ||
79 | } | ||
75 | } | 80 | } |
76 | } | 81 | } |
77 | 82 | ||