aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/proxy.config.json4
-rw-r--r--client/src/app/+admin/system/logs/logs.component.scss1
-rw-r--r--client/src/app/+admin/system/logs/logs.component.ts2
-rw-r--r--client/src/app/shared/images/global-icon.component.ts5
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss4
-rw-r--r--client/src/sass/primeng-custom.scss14
6 files changed, 23 insertions, 7 deletions
diff --git a/client/proxy.config.json b/client/proxy.config.json
index d1f393672..e5f0dfd61 100644
--- a/client/proxy.config.json
+++ b/client/proxy.config.json
@@ -6,5 +6,9 @@
6 "/static": { 6 "/static": {
7 "target": "http://localhost:9000", 7 "target": "http://localhost:9000",
8 "secure": false 8 "secure": false
9 },
10 "/socket.io": {
11 "target": "http://localhost:9000",
12 "secure": false
9 } 13 }
10} 14}
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index ab00fb5ae..7ad2e853c 100644
--- a/client/src/app/+admin/system/logs/logs.component.scss
+++ b/client/src/app/+admin/system/logs/logs.component.scss
@@ -11,6 +11,7 @@
11 11
12 .log-row { 12 .log-row {
13 margin-top: 1px; 13 margin-top: 1px;
14 word-break: break-word;
14 15
15 &:hover { 16 &:hover {
16 background: rgba(0, 0, 0, 0.07); 17 background: rgba(0, 0, 0, 0.07);
diff --git a/client/src/app/+admin/system/logs/logs.component.ts b/client/src/app/+admin/system/logs/logs.component.ts
index 17abb8409..1a3508a3b 100644
--- a/client/src/app/+admin/system/logs/logs.component.ts
+++ b/client/src/app/+admin/system/logs/logs.component.ts
@@ -106,6 +106,6 @@ export class LogsComponent implements OnInit {
106 } 106 }
107 ] 107 ]
108 108
109 this.level = 'info' 109 this.level = 'warn'
110 } 110 }
111} 111}
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts
index 03cf3d7ae..5a3db4531 100644
--- a/client/src/app/shared/images/global-icon.component.ts
+++ b/client/src/app/shared/images/global-icon.component.ts
@@ -1,4 +1,4 @@
1import { Component, ElementRef, Input, OnInit } from '@angular/core' 1import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core'
2 2
3const icons = { 3const icons = {
4 'add': require('../../../assets/images/global/add.html'), 4 'add': require('../../../assets/images/global/add.html'),
@@ -53,7 +53,8 @@ export type GlobalIconName = keyof typeof icons
53@Component({ 53@Component({
54 selector: 'my-global-icon', 54 selector: 'my-global-icon',
55 template: '', 55 template: '',
56 styleUrls: [ './global-icon.component.scss' ] 56 styleUrls: [ './global-icon.component.scss' ],
57 changeDetection: ChangeDetectionStrategy.OnPush
57}) 58})
58export class GlobalIconComponent implements OnInit { 59export class GlobalIconComponent implements OnInit {
59 @Input() iconName: GlobalIconName 60 @Input() iconName: GlobalIconName
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index de932c99d..d8113b666 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -432,13 +432,14 @@ my-video-comments {
432 432
433@media screen and (max-width: $small-view) { 433@media screen and (max-width: $small-view) {
434 .privacy-concerns { 434 .privacy-concerns {
435 margin-left: $menu-width; 435 margin-left: $menu-width - 15px; // Menu is absolute
436 } 436 }
437} 437}
438 438
439:host-context(.expanded) { 439:host-context(.expanded) {
440 .privacy-concerns { 440 .privacy-concerns {
441 width: 100%; 441 width: 100%;
442 margin-left: -15px;
442 } 443 }
443} 444}
444 445
@@ -449,6 +450,7 @@ my-video-comments {
449 padding: 5px 15px; 450 padding: 5px 15px;
450 451
451 display: flex; 452 display: flex;
453 flex-wrap: nowrap;
452 align-items: center; 454 align-items: center;
453 justify-content: flex-start; 455 justify-content: flex-start;
454 background-color: rgba(0, 0, 0, 0.9); 456 background-color: rgba(0, 0, 0, 0.9);
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 6de145379..957b99356 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -63,8 +63,13 @@ p-table {
63 &:hover { 63 &:hover {
64 background-color: var(--submenuColor) !important; 64 background-color: var(--submenuColor) !important;
65 65
66 .action-cell .dropdown-root { 66 .action-cell {
67 display: block !important; 67 .dropdown-root,
68 my-edit-button,
69 my-delete-button,
70 my-button {
71 display: block !important;
72 }
68 } 73 }
69 } 74 }
70 75
@@ -138,7 +143,10 @@ p-table {
138 padding: 0 !important; 143 padding: 0 !important;
139 text-align: center; 144 text-align: center;
140 145
141 .dropdown-root { 146 .dropdown-root,
147 my-edit-button,
148 my-delete-button,
149 my-button {
142 display: none !important; 150 display: none !important;
143 151
144 &.show { 152 &.show {