diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-19 11:12:01 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-11-19 15:25:41 +0100 |
commit | 4f926722ea6784ea389013378fd233f59077ec8a (patch) | |
tree | 36e92da1d8fc9394e1e36144f206e0427b7c02c3 /client/src/app/+admin | |
parent | fce7fe04eed39e23e76717085e92118e963def81 (diff) | |
download | PeerTube-4f926722ea6784ea389013378fd233f59077ec8a.tar.gz PeerTube-4f926722ea6784ea389013378fd233f59077ec8a.tar.zst PeerTube-4f926722ea6784ea389013378fd233f59077ec8a.zip |
Upgrade client dependencies
Migrate removed primeng theme to custom CSS
Diffstat (limited to 'client/src/app/+admin')
4 files changed, 4 insertions, 31 deletions
diff --git a/client/src/app/+admin/admin.component.html b/client/src/app/+admin/admin.component.html index aca4d9b0c..f1531f3ef 100644 --- a/client/src/app/+admin/admin.component.html +++ b/client/src/app/+admin/admin.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <div> | 1 | <div class="root"> |
2 | <my-top-menu-dropdown [menuEntries]="menuEntries"></my-top-menu-dropdown> | 2 | <my-top-menu-dropdown [menuEntries]="menuEntries"></my-top-menu-dropdown> |
3 | 3 | ||
4 | <div class="margin-content" [ngClass]="{ 'offset-content': !isBroadcastMessageDisplayed }"> | 4 | <div class="margin-content" [ngClass]="{ 'offset-content': !isBroadcastMessageDisplayed }"> |
diff --git a/client/src/app/+admin/admin.component.scss b/client/src/app/+admin/admin.component.scss index 61a2744ba..c98cc9be5 100644 --- a/client/src/app/+admin/admin.component.scss +++ b/client/src/app/+admin/admin.component.scss | |||
@@ -5,4 +5,6 @@ my-top-menu-dropdown { | |||
5 | flex-grow: 1; | 5 | flex-grow: 1; |
6 | } | 6 | } |
7 | 7 | ||
8 | @include sub-menu-h1; | 8 | .root { |
9 | @include sub-menu-h1; | ||
10 | } | ||
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index 5f71f1238..f34490cc8 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts | |||
@@ -6,7 +6,6 @@ import { BatchDomainsModalComponent } from '@app/shared/shared-moderation' | |||
6 | import { ActorFollow } from '@shared/models' | 6 | import { ActorFollow } from '@shared/models' |
7 | 7 | ||
8 | @Component({ | 8 | @Component({ |
9 | selector: 'my-followers-list', | ||
10 | templateUrl: './following-list.component.html', | 9 | templateUrl: './following-list.component.html', |
11 | styleUrls: [ '../follows.component.scss', './following-list.component.scss' ] | 10 | styleUrls: [ '../follows.component.scss', './following-list.component.scss' ] |
12 | }) | 11 | }) |
diff --git a/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss b/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss index b653abfaa..9e98fcd34 100644 --- a/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss +++ b/client/src/app/+admin/plugins/shared/toggle-plugin-type.scss | |||
@@ -5,32 +5,4 @@ | |||
5 | display: flex; | 5 | display: flex; |
6 | justify-content: center; | 6 | justify-content: center; |
7 | margin-bottom: 30px; | 7 | margin-bottom: 30px; |
8 | |||
9 | p-selectButton { | ||
10 | ::ng-deep { | ||
11 | .ui-button-text { | ||
12 | font-size: 15px; | ||
13 | font-weight: 600; | ||
14 | } | ||
15 | |||
16 | .ui-button.ui-state-default { | ||
17 | background-color: #f0f0f0; | ||
18 | border: 1px solid #f0f0f0; | ||
19 | } | ||
20 | |||
21 | .ui-button.ui-state-active { | ||
22 | background-color: pvar(--mainColor); | ||
23 | border-color: pvar(--mainColor); | ||
24 | |||
25 | &:hover { | ||
26 | background-color: pvar(--mainHoverColor); | ||
27 | border-color: pvar(--mainHoverColor); | ||
28 | } | ||
29 | } | ||
30 | |||
31 | .ui-button:not(.ui-state-active).ui-state-focus { | ||
32 | box-shadow: 0 0 0 .1rem rgba(87, 85, 217, .2); | ||
33 | } | ||
34 | } | ||
35 | } | ||
36 | } | 8 | } |