diff options
Diffstat (limited to 'client/src/app/+my-account')
7 files changed, 13 insertions, 12 deletions
diff --git a/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.html b/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.html index 59ca61be6..e83b59019 100644 --- a/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.html +++ b/client/src/app/+my-account/my-account-abuses/my-account-abuses-list.component.html | |||
@@ -3,4 +3,4 @@ | |||
3 | <ng-container i18n>Reports</ng-container> | 3 | <ng-container i18n>Reports</ng-container> |
4 | </h1> | 4 | </h1> |
5 | 5 | ||
6 | <my-abuse-list-table viewType="user" baseRoute="/my-account/abuses"></my-abuse-list-table> | 6 | <my-abuse-list-table viewType="user"></my-abuse-list-table> |
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss b/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss index 704132c03..c1e1f2432 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.scss | |||
@@ -21,7 +21,7 @@ input[type=submit] { | |||
21 | display: flex; | 21 | display: flex; |
22 | margin-left: auto; | 22 | margin-left: auto; |
23 | 23 | ||
24 | & + .form-error { | 24 | + .form-error { |
25 | display: inline; | 25 | display: inline; |
26 | margin-left: 5px; | 26 | margin-left: 5px; |
27 | } | 27 | } |
diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss index 035fa2b27..abf52504a 100644 --- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss +++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.scss | |||
@@ -32,7 +32,8 @@ my-user-notifications { | |||
32 | .header { | 32 | .header { |
33 | flex-direction: column; | 33 | flex-direction: column; |
34 | 34 | ||
35 | & >:first-child, .peertube-select-container { | 35 | > :first-child, |
36 | .peertube-select-container { | ||
36 | margin-bottom: 15px; | 37 | margin-bottom: 15px; |
37 | } | 38 | } |
38 | 39 | ||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss index d79ff690b..64f960964 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.scss | |||
@@ -7,4 +7,4 @@ | |||
7 | @include danger-button; | 7 | @include danger-button; |
8 | @include disable-outline; | 8 | @include disable-outline; |
9 | } | 9 | } |
10 | } \ No newline at end of file | 10 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss index b06d8b16d..42319400d 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.scss | |||
@@ -10,7 +10,7 @@ | |||
10 | font-size: 16px; | 10 | font-size: 16px; |
11 | } | 11 | } |
12 | 12 | ||
13 | & > div { | 13 | > div { |
14 | padding: 10px; | 14 | padding: 10px; |
15 | 15 | ||
16 | &:first-child { | 16 | &:first-child { |
diff --git a/client/src/app/+my-account/my-account.component.scss b/client/src/app/+my-account/my-account.component.scss index a5bb499b4..b32bc84e7 100644 --- a/client/src/app/+my-account/my-account.component.scss +++ b/client/src/app/+my-account/my-account.component.scss | |||
@@ -2,12 +2,12 @@ | |||
2 | @import '_mixins'; | 2 | @import '_mixins'; |
3 | 3 | ||
4 | .row { | 4 | .row { |
5 | @include sub-menu-h1; | ||
6 | |||
5 | flex-direction: column; | 7 | flex-direction: column; |
6 | width: 100%; | 8 | width: 100%; |
7 | 9 | ||
8 | & > my-top-menu-dropdown:nth-child(1) { | 10 | > my-top-menu-dropdown:nth-child(1) { |
9 | flex-grow: 1; | 11 | flex-grow: 1; |
10 | } | 12 | } |
11 | |||
12 | @include sub-menu-h1; | ||
13 | } | 13 | } |
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts index 050cd4b34..4081e4f01 100644 --- a/client/src/app/+my-account/my-account.module.ts +++ b/client/src/app/+my-account/my-account.module.ts | |||
@@ -3,13 +3,14 @@ import { TableModule } from 'primeng/table' | |||
3 | import { DragDropModule } from '@angular/cdk/drag-drop' | 3 | import { DragDropModule } from '@angular/cdk/drag-drop' |
4 | import { NgModule } from '@angular/core' | 4 | import { NgModule } from '@angular/core' |
5 | import { SharedAbuseListModule } from '@app/shared/shared-abuse-list' | 5 | import { SharedAbuseListModule } from '@app/shared/shared-abuse-list' |
6 | import { SharedActorImageModule } from '@app/shared/shared-actor-image' | 6 | import { SharedActorImageEditModule } from '@app/shared/shared-actor-image-edit' |
7 | import { SharedFormModule } from '@app/shared/shared-forms' | 7 | import { SharedFormModule } from '@app/shared/shared-forms' |
8 | import { SharedGlobalIconModule } from '@app/shared/shared-icons' | 8 | import { SharedGlobalIconModule } from '@app/shared/shared-icons' |
9 | import { SharedMainModule } from '@app/shared/shared-main' | 9 | import { SharedMainModule } from '@app/shared/shared-main' |
10 | import { SharedModerationModule } from '@app/shared/shared-moderation' | 10 | import { SharedModerationModule } from '@app/shared/shared-moderation' |
11 | import { SharedShareModal } from '@app/shared/shared-share-modal' | 11 | import { SharedShareModal } from '@app/shared/shared-share-modal' |
12 | import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings' | 12 | import { SharedUserInterfaceSettingsModule } from '@app/shared/shared-user-settings' |
13 | import { SharedActorImageModule } from '../shared/shared-actor-image/shared-actor-image.module' | ||
13 | import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component' | 14 | import { MyAccountAbusesListComponent } from './my-account-abuses/my-account-abuses-list.component' |
14 | import { MyAccountApplicationsComponent } from './my-account-applications/my-account-applications.component' | 15 | import { MyAccountApplicationsComponent } from './my-account-applications/my-account-applications.component' |
15 | import { MyAccountBlocklistComponent } from './my-account-blocklist/my-account-blocklist.component' | 16 | import { MyAccountBlocklistComponent } from './my-account-blocklist/my-account-blocklist.component' |
@@ -23,7 +24,6 @@ import { MyAccountNotificationPreferencesComponent } from './my-account-settings | |||
23 | import { MyAccountProfileComponent } from './my-account-settings/my-account-profile/my-account-profile.component' | 24 | import { MyAccountProfileComponent } from './my-account-settings/my-account-profile/my-account-profile.component' |
24 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' | 25 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' |
25 | import { MyAccountComponent } from './my-account.component' | 26 | import { MyAccountComponent } from './my-account.component' |
26 | import { SharedAccountAvatarModule } from '../shared/shared-account-avatar/shared-account-avatar.module' | ||
27 | 27 | ||
28 | @NgModule({ | 28 | @NgModule({ |
29 | imports: [ | 29 | imports: [ |
@@ -40,8 +40,8 @@ import { SharedAccountAvatarModule } from '../shared/shared-account-avatar/share | |||
40 | SharedGlobalIconModule, | 40 | SharedGlobalIconModule, |
41 | SharedAbuseListModule, | 41 | SharedAbuseListModule, |
42 | SharedShareModal, | 42 | SharedShareModal, |
43 | SharedAccountAvatarModule, | 43 | SharedActorImageModule, |
44 | SharedActorImageModule | 44 | SharedActorImageEditModule |
45 | ], | 45 | ], |
46 | 46 | ||
47 | declarations: [ | 47 | declarations: [ |