From 28e0e40d2b301f109a4dd20a5be1f0b58e8201ad Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 15 Apr 2019 09:43:23 +0200
Subject: [PATCH] Fix privacy warning position on mobile
---
client/proxy.config.json | 4 ++++
.../src/app/+admin/system/logs/logs.component.scss | 1 +
.../src/app/+admin/system/logs/logs.component.ts | 2 +-
.../src/app/shared/images/global-icon.component.ts | 5 +++--
.../videos/+video-watch/video-watch.component.scss | 4 +++-
client/src/sass/primeng-custom.scss | 14 +++++++++++---
6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/client/proxy.config.json b/client/proxy.config.json
index d1f3936729..e5f0dfd617 100644
--- a/client/proxy.config.json
+++ b/client/proxy.config.json
@@ -6,5 +6,9 @@
"/static": {
"target": "http://localhost:9000",
"secure": false
+ },
+ "/socket.io": {
+ "target": "http://localhost:9000",
+ "secure": false
}
}
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index ab00fb5aef..7ad2e853cf 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 @@
.log-row {
margin-top: 1px;
+ word-break: break-word;
&:hover {
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 17abb84093..1a3508a3bf 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 {
}
]
- this.level = 'info'
+ this.level = 'warn'
}
}
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts
index 03cf3d7ae5..5a3db4531c 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 @@
-import { Component, ElementRef, Input, OnInit } from '@angular/core'
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@angular/core'
const icons = {
'add': require('../../../assets/images/global/add.html'),
@@ -53,7 +53,8 @@ export type GlobalIconName = keyof typeof icons
@Component({
selector: 'my-global-icon',
template: '',
- styleUrls: [ './global-icon.component.scss' ]
+ styleUrls: [ './global-icon.component.scss' ],
+ changeDetection: ChangeDetectionStrategy.OnPush
})
export class GlobalIconComponent implements OnInit {
@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 de932c99d7..d8113b666d 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 {
@media screen and (max-width: $small-view) {
.privacy-concerns {
- margin-left: $menu-width;
+ margin-left: $menu-width - 15px; // Menu is absolute
}
}
:host-context(.expanded) {
.privacy-concerns {
width: 100%;
+ margin-left: -15px;
}
}
@@ -449,6 +450,7 @@ my-video-comments {
padding: 5px 15px;
display: flex;
+ flex-wrap: nowrap;
align-items: center;
justify-content: flex-start;
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 6de1453790..957b993565 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -63,8 +63,13 @@ p-table {
&:hover {
background-color: var(--submenuColor) !important;
- .action-cell .dropdown-root {
- display: block !important;
+ .action-cell {
+ .dropdown-root,
+ my-edit-button,
+ my-delete-button,
+ my-button {
+ display: block !important;
+ }
}
}
@@ -138,7 +143,10 @@ p-table {
padding: 0 !important;
text-align: center;
- .dropdown-root {
+ .dropdown-root,
+ my-edit-button,
+ my-delete-button,
+ my-button {
display: none !important;
&.show {
--
GitLab