diff options
author | Chocobozzz <me@florianbigard.com> | 2020-12-15 09:32:55 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-12-15 10:54:53 +0100 |
commit | d89fcd1e5efe1f91652a7c9da02a9323dc035f2b (patch) | |
tree | 6eab00f1674c006400dbf11c681c05608b9bf732 | |
parent | c9bc850e93295661e743255b8623ac8e2a95c391 (diff) | |
download | PeerTube-d89fcd1e5efe1f91652a7c9da02a9323dc035f2b.tar.gz PeerTube-d89fcd1e5efe1f91652a7c9da02a9323dc035f2b.tar.zst PeerTube-d89fcd1e5efe1f91652a7c9da02a9323dc035f2b.zip |
Fix password input in edit user
4 files changed, 19 insertions, 4 deletions
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index 819ced834..e1260c123 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html | |||
@@ -122,9 +122,11 @@ | |||
122 | </ng-container> | 122 | </ng-container> |
123 | </ng-template> | 123 | </ng-template> |
124 | </my-help> | 124 | </my-help> |
125 | <my-input-toggle-hidden formControlName="password" id="password" | 125 | |
126 | [ngClass]="{ 'input-error': formErrors['password'] }" | 126 | <my-input-toggle-hidden |
127 | autocomplete="new-password"></my-input-toggle-hidden> | 127 | formControlName="password" id="password" [ngClass]="{ 'input-error': formErrors['password'] }" autocomplete="new-password" |
128 | ></my-input-toggle-hidden> | ||
129 | |||
128 | <div *ngIf="formErrors.password" class="form-error"> | 130 | <div *ngIf="formErrors.password" class="form-error"> |
129 | {{ formErrors.password }} | 131 | {{ formErrors.password }} |
130 | </div> | 132 | </div> |
diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.scss b/client/src/app/+admin/users/user-edit/user-edit.component.scss index 30c37f148..3b7715062 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.scss +++ b/client/src/app/+admin/users/user-edit/user-edit.component.scss | |||
@@ -19,6 +19,12 @@ input:not([type=submit]) { | |||
19 | display: block; | 19 | display: block; |
20 | } | 20 | } |
21 | 21 | ||
22 | my-input-toggle-hidden { | ||
23 | @include responsive-width(340px); | ||
24 | |||
25 | display: block; | ||
26 | } | ||
27 | |||
22 | .peertube-select-container { | 28 | .peertube-select-container { |
23 | @include peertube-select-container(340px); | 29 | @include peertube-select-container(340px); |
24 | } | 30 | } |
diff --git a/client/src/app/shared/shared-instance/instance-follow.service.ts b/client/src/app/shared/shared-instance/instance-follow.service.ts index f99dced21..229b58213 100644 --- a/client/src/app/shared/shared-instance/instance-follow.service.ts +++ b/client/src/app/shared/shared-instance/instance-follow.service.ts | |||
@@ -9,7 +9,7 @@ import { environment } from '../../../environments/environment' | |||
9 | 9 | ||
10 | @Injectable() | 10 | @Injectable() |
11 | export class InstanceFollowService { | 11 | export class InstanceFollowService { |
12 | private static BASE_APPLICATION_URL = 'https://peertube2.cpy.re' + '/api/v1/server' | 12 | private static BASE_APPLICATION_URL = environment.production + '/api/v1/server' |
13 | 13 | ||
14 | constructor ( | 14 | constructor ( |
15 | private authHttp: HttpClient, | 15 | private authHttp: HttpClient, |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 19b4e204f..1231d2c44 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
@@ -305,6 +305,13 @@ | |||
305 | z-index: 100; | 305 | z-index: 100; |
306 | } | 306 | } |
307 | 307 | ||
308 | @mixin responsive-width ($width) { | ||
309 | width: $width; | ||
310 | |||
311 | @media screen and (max-width: $width) { | ||
312 | width: 100%; | ||
313 | } | ||
314 | } | ||
308 | 315 | ||
309 | @mixin ng-select ($width) { | 316 | @mixin ng-select ($width) { |
310 | ::ng-deep &.ng-select, | 317 | ::ng-deep &.ng-select, |