diff options
6 files changed, 17 insertions, 17 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 0c7900529..0cb625b4a 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 | |||
@@ -60,7 +60,7 @@ | |||
60 | <div class="form-row" *ngIf="!isInBigView()"> <!-- hidden on large screens, as it is then displayed on the right side of the form --> | 60 | <div class="form-row" *ngIf="!isInBigView()"> <!-- hidden on large screens, as it is then displayed on the right side of the form --> |
61 | <div class="col-12 col-xl-3"></div> | 61 | <div class="col-12 col-xl-3"></div> |
62 | 62 | ||
63 | <div class="form-group-right col-12 col-xl-9"> | 63 | <div class="col-12 col-xl-9"> |
64 | <ng-template *ngTemplateOutlet="dashboard"></ng-template> | 64 | <ng-template *ngTemplateOutlet="dashboard"></ng-template> |
65 | </div> | 65 | </div> |
66 | </div> | 66 | </div> |
@@ -76,7 +76,7 @@ | |||
76 | </div> | 76 | </div> |
77 | </div> | 77 | </div> |
78 | 78 | ||
79 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9" [ngClass]="{ 'form-row': isInBigView() }"> | 79 | <div class="form-group col-12 col-lg-8 col-xl-9" [ngClass]="{ 'form-row': isInBigView() }"> |
80 | 80 | ||
81 | <form role="form" (ngSubmit)="formValidated()" [formGroup]="form" [ngClass]="{ 'col-5': isInBigView() }"> | 81 | <form role="form" (ngSubmit)="formValidated()" [formGroup]="form" [ngClass]="{ 'col-5': isInBigView() }"> |
82 | <div class="form-group" *ngIf="isCreation()"> | 82 | <div class="form-group" *ngIf="isCreation()"> |
@@ -197,7 +197,7 @@ | |||
197 | <div i18n class="account-title account-title-danger">DANGER ZONE</div> | 197 | <div i18n class="account-title account-title-danger">DANGER ZONE</div> |
198 | </div> | 198 | </div> |
199 | 199 | ||
200 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9" [ngClass]="{ 'form-row': isInBigView() }"> | 200 | <div class="form-group col-12 col-lg-8 col-xl-9" [ngClass]="{ 'form-row': isInBigView() }"> |
201 | 201 | ||
202 | <div class="danger-zone"> | 202 | <div class="danger-zone"> |
203 | <div class="form-group reset-password-email"> | 203 | <div class="form-group reset-password-email"> |
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html index 53a9c91ac..3fbb79c71 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.html +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.html | |||
@@ -7,18 +7,18 @@ | |||
7 | <div class="form-group col-12 col-lg-4 col-xl-3"> | 7 | <div class="form-group col-12 col-lg-4 col-xl-3"> |
8 | <h2 i18n class="applications-title">SUBSCRIPTION FEED</h2> | 8 | <h2 i18n class="applications-title">SUBSCRIPTION FEED</h2> |
9 | <div i18n class="applications-description"> | 9 | <div i18n class="applications-description"> |
10 | Use third-party feed aggregators to retrieve the list of videos from | 10 | Use third-party feed aggregators to retrieve the list of videos from |
11 | channels you subscribed to. Make sure to keep your token private. | 11 | channels you subscribed to. Make sure to keep your token private. |
12 | </div> | 12 | </div> |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 15 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
16 | 16 | ||
17 | <div class="form-group"> | 17 | <div class="form-group"> |
18 | <label i18n for="feed-url">Feed URL</label> | 18 | <label i18n for="feed-url">Feed URL</label> |
19 | <my-input-readonly-copy [value]="feedUrl"></my-input-readonly-copy> | 19 | <my-input-readonly-copy [value]="feedUrl"></my-input-readonly-copy> |
20 | </div> | 20 | </div> |
21 | 21 | ||
22 | <div class="form-group"> | 22 | <div class="form-group"> |
23 | <label i18n for="feed-token">Feed Token</label> | 23 | <label i18n for="feed-token">Feed Token</label> |
24 | <my-input-readonly-copy [value]="feedToken"></my-input-readonly-copy> | 24 | <my-input-readonly-copy [value]="feedToken"></my-input-readonly-copy> |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss index 5995bae4a..ec3f6029e 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.scss | |||
@@ -24,7 +24,7 @@ input[type=submit] { | |||
24 | } | 24 | } |
25 | 25 | ||
26 | textarea { | 26 | textarea { |
27 | @include peertube-textarea(500px, 150px); | 27 | @include peertube-textarea(100%, 150px); |
28 | max-width: 100%; | 28 | max-width: 100%; |
29 | 29 | ||
30 | display: block; | 30 | display: block; |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index 2ad014f01..40505b92f 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <div class="form-row"> <!-- preview --> | 2 | <div class="form-row"> <!-- preview --> |
3 | <div class="form-group col-12 col-lg-4 col-xl-3"></div> | 3 | <div class="form-group col-12 col-lg-4 col-xl-3"></div> |
4 | 4 | ||
5 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 5 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
6 | <my-actor-avatar-info [actor]="user.account" (avatarChange)="onAvatarChange($event)"></my-actor-avatar-info> | 6 | <my-actor-avatar-info [actor]="user.account" (avatarChange)="onAvatarChange($event)"></my-actor-avatar-info> |
7 | </div> | 7 | </div> |
8 | </div> | 8 | </div> |
@@ -12,7 +12,7 @@ | |||
12 | <h2 i18n class="account-title">PROFILE SETTINGS</h2> | 12 | <h2 i18n class="account-title">PROFILE SETTINGS</h2> |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 15 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
16 | 16 | ||
17 | <my-user-quota [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-quota> | 17 | <my-user-quota [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-quota> |
18 | 18 | ||
@@ -26,7 +26,7 @@ | |||
26 | <h2 i18n class="account-title">VIDEO SETTINGS</h2> | 26 | <h2 i18n class="account-title">VIDEO SETTINGS</h2> |
27 | </div> | 27 | </div> |
28 | 28 | ||
29 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 29 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
30 | <my-user-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-video-settings> | 30 | <my-user-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-video-settings> |
31 | </div> | 31 | </div> |
32 | </div> | 32 | </div> |
@@ -37,7 +37,7 @@ | |||
37 | <h2 i18n class="account-title">NOTIFICATIONS</h2> | 37 | <h2 i18n class="account-title">NOTIFICATIONS</h2> |
38 | </div> | 38 | </div> |
39 | 39 | ||
40 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 40 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
41 | <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences> | 41 | <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences> |
42 | </div> | 42 | </div> |
43 | </div> | 43 | </div> |
@@ -47,7 +47,7 @@ | |||
47 | <h2 i18n class="account-title">INTERFACE</h2> | 47 | <h2 i18n class="account-title">INTERFACE</h2> |
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 50 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
51 | <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings> | 51 | <my-user-interface-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-user-interface-settings> |
52 | </div> | 52 | </div> |
53 | </div> | 53 | </div> |
@@ -57,7 +57,7 @@ | |||
57 | <h2 i18n class="account-title">PASSWORD</h2> | 57 | <h2 i18n class="account-title">PASSWORD</h2> |
58 | </div> | 58 | </div> |
59 | 59 | ||
60 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 60 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
61 | <my-account-change-password></my-account-change-password> | 61 | <my-account-change-password></my-account-change-password> |
62 | </div> | 62 | </div> |
63 | </div> | 63 | </div> |
@@ -67,7 +67,7 @@ | |||
67 | <h2 i18n class="account-title">EMAIL</h2> | 67 | <h2 i18n class="account-title">EMAIL</h2> |
68 | </div> | 68 | </div> |
69 | 69 | ||
70 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 70 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
71 | <my-account-change-email></my-account-change-email> | 71 | <my-account-change-email></my-account-change-email> |
72 | </div> | 72 | </div> |
73 | </div> | 73 | </div> |
@@ -77,7 +77,7 @@ | |||
77 | <h2 i18n class="account-title account-title-danger">DANGER ZONE</h2> | 77 | <h2 i18n class="account-title account-title-danger">DANGER ZONE</h2> |
78 | </div> | 78 | </div> |
79 | 79 | ||
80 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 80 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
81 | <my-account-danger-zone [user]="user"></my-account-danger-zone> | 81 | <my-account-danger-zone [user]="user"></my-account-danger-zone> |
82 | </div> | 82 | </div> |
83 | </div> | 83 | </div> |
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html b/client/src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html index 7e0c4e732..5ea000400 100644 --- a/client/src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html +++ b/client/src/app/+my-library/+my-video-channels/my-video-channel-edit.component.html | |||
@@ -26,7 +26,7 @@ | |||
26 | <div *ngIf="!isCreation() && videoChannelToUpdate" class="video-channel-title" i18n>CHANNEL</div> | 26 | <div *ngIf="!isCreation() && videoChannelToUpdate" class="video-channel-title" i18n>CHANNEL</div> |
27 | </div> | 27 | </div> |
28 | 28 | ||
29 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 29 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
30 | 30 | ||
31 | <div class="form-group" *ngIf="isCreation()"> | 31 | <div class="form-group" *ngIf="isCreation()"> |
32 | <label i18n for="name">Name</label> | 32 | <label i18n for="name">Name</label> |
diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html index 0d8d2a447..9b9befca4 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlist-edit.component.html | |||
@@ -26,7 +26,7 @@ | |||
26 | <div *ngIf="!isCreation() && videoPlaylistToUpdate" class="video-playlist-title" i18n>PLAYLIST</div> | 26 | <div *ngIf="!isCreation() && videoPlaylistToUpdate" class="video-playlist-title" i18n>PLAYLIST</div> |
27 | </div> | 27 | </div> |
28 | 28 | ||
29 | <div class="form-group form-group-right col-12 col-lg-8 col-xl-9"> | 29 | <div class="form-group col-12 col-lg-8 col-xl-9"> |
30 | 30 | ||
31 | <div class="col-md-12 col-xl-6"> | 31 | <div class="col-md-12 col-xl-6"> |
32 | <div class="form-group"> | 32 | <div class="form-group"> |