aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html23
-rw-r--r--client/src/sass/ng-select.scss10
2 files changed, 25 insertions, 8 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 7ecfb7702..5f02d00e8 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
@@ -885,15 +885,22 @@
885 885
886 <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> 886 <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
887 <label i18n for="transcodingProfile">Transcoding profile</label> 887 <label i18n for="transcodingProfile">Transcoding profile</label>
888 <span class="text-muted ml-1" i18n>New transcoding profiles can be added by PeerTube plugins</span> 888 <span class="text-muted ml-1" i18n>new transcoding profiles can be added by PeerTube plugins</span>
889 889
890 <div class="peertube-select-container"> 890 <ng-select
891 <select id="transcodingProfile" formControlName="profile" class="form-control"> 891 id="transcodingProfile"
892 <option *ngFor="let vodTranscodingProfileOption of getAvailableTranscodingProfile('vod')" [value]="vodTranscodingProfileOption"> 892 formControlName="profile"
893 {{ vodTranscodingProfileOption }} 893 [items]="getAvailableTranscodingProfile('vod')"
894 </option> 894 [clearable]="false"
895 </select> 895 >
896 </div> 896 <ng-template ng-option-tmp let-item="item" let-index="index">
897 {{ item }}
898 <ng-container *ngIf="item === 'default'">
899 <br>
900 <span class="text-muted">x264, targeting maximum device compatibility</span>
901 </ng-container>
902 </ng-template>
903 </ng-select>
897 <div *ngIf="formErrors.transcoding.profile" class="form-error">{{ formErrors.transcoding.profile }}</div> 904 <div *ngIf="formErrors.transcoding.profile" class="form-error">{{ formErrors.transcoding.profile }}</div>
898 </div> 905 </div>
899 906
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index d7ea73d48..54c805ccf 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -20,6 +20,11 @@ $ng-select-height: 30px;
20 font-size: .9em; 20 font-size: .9em;
21} 21}
22 22
23.ng-input,
24.ng-select .ng-select-container .ng-value-container {
25 padding-left: 15px !important;
26}
27
23.ng-select { 28.ng-select {
24 &.ng-select-focused { 29 &.ng-select-focused {
25 &:not(.ng-select-opened) > .ng-select-container { 30 &:not(.ng-select-opened) > .ng-select-container {
@@ -29,6 +34,11 @@ $ng-select-height: 30px;
29 34
30 .ng-select-container { 35 .ng-select-container {
31 background-color: pvar(--inputBackgroundColor); 36 background-color: pvar(--inputBackgroundColor);
37
38 }
39
40 .ng-arrow-wrapper {
41 padding-right: 12px
32 } 42 }
33 43
34 &.ng-select-single .ng-value-container .ng-value { 44 &.ng-select-single .ng-value-container .ng-value {