From c5e7b5f93d4eb0c65a0d7362c86c80c94e1eef77 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Thu, 31 Oct 2024 16:52:40 +0200 Subject: [PATCH 1/9] Fixed sizing for codeblocks --- .../home/components/event/event-content-dialog.component.ts | 4 ++-- .../lib/home-page/getting-started-widget.component.scss | 2 +- ui-ngx/src/app/shared/components/markdown.component.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts index 65b5be9b75..fb7b026914 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts @@ -139,14 +139,14 @@ export class EventContentDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 16 * lines.length + 16; + newHeight = 18 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 8 * maxLineLength + 16; + newWidth = 10 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 65eaf66c54..3e34cbdcd9 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -118,7 +118,7 @@ padding: 0; pre[class*=language-] { margin: 0; - padding: 9px 38px 9px 16px; + padding: 10px 38px 10px 16px; background: rgba(0, 0, 0, 0.03); border-radius: 6px; border: none; diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss index 0c5e310e07..c47a78011b 100644 --- a/ui-ngx/src/app/shared/components/markdown.component.scss +++ b/ui-ngx/src/app/shared/components/markdown.component.scss @@ -370,7 +370,7 @@ } &.line-numbers { - padding-left: 66px; + padding: 10px 16px 10px 66px; & > code { span.line-numbers-rows { From 2823577c34be135fb11638f32a8ca52feb9e372d Mon Sep 17 00:00:00 2001 From: mpetrov Date: Tue, 5 Nov 2024 12:38:05 +0200 Subject: [PATCH 2/9] Added size fix for audit log --- .../audit-log/audit-log-details-dialog.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts index 18bf1d4f03..9d983919fc 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts @@ -105,14 +105,14 @@ export class AuditLogDetailsDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 16 * lines.length + 16; + newHeight = 18 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 8 * maxLineLength + 16; + newWidth = 10 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); From 2a330fe5832e1548b2ba933858200c677a772159 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 15 Nov 2024 16:11:59 +0200 Subject: [PATCH 3/9] adjusted sizing --- .../audit-log/audit-log-details-dialog.component.ts | 4 ++-- .../home/components/event/event-content-dialog.component.ts | 4 ++-- .../lib/home-page/getting-started-widget.component.scss | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts index 9d983919fc..881961ed34 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts @@ -105,14 +105,14 @@ export class AuditLogDetailsDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 18 * lines.length + 16; + newHeight = 17 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 10 * maxLineLength + 16; + newWidth = 9 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts index fb7b026914..40cd3b6f3b 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts @@ -139,14 +139,14 @@ export class EventContentDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 18 * lines.length + 16; + newHeight = 17 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 10 * maxLineLength + 16; + newWidth = 9 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 3e34cbdcd9..2dcfdf7cd1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -118,7 +118,7 @@ padding: 0; pre[class*=language-] { margin: 0; - padding: 10px 38px 10px 16px; + padding: 9px 38px 9px 16px; background: rgba(0, 0, 0, 0.03); border-radius: 6px; border: none; @@ -128,7 +128,6 @@ font-style: normal; font-weight: 400; font-size: 12px; - line-height: 16px; letter-spacing: 0.25px; color: rgba(0, 0, 0, 0.38); overflow: hidden; From c6ff132a245ac60fd336daaa7740325387e469f7 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 12:07:06 +0200 Subject: [PATCH 4/9] Revert "adjusted sizing" This reverts commit 2a330fe5832e1548b2ba933858200c677a772159. --- .../audit-log/audit-log-details-dialog.component.ts | 4 ++-- .../home/components/event/event-content-dialog.component.ts | 4 ++-- .../lib/home-page/getting-started-widget.component.scss | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts index 881961ed34..9d983919fc 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts @@ -105,14 +105,14 @@ export class AuditLogDetailsDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 17 * lines.length + 16; + newHeight = 18 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 9 * maxLineLength + 16; + newWidth = 10 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts index 40cd3b6f3b..fb7b026914 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts @@ -139,14 +139,14 @@ export class EventContentDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 17 * lines.length + 16; + newHeight = 18 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 9 * maxLineLength + 16; + newWidth = 10 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 2dcfdf7cd1..3e34cbdcd9 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -118,7 +118,7 @@ padding: 0; pre[class*=language-] { margin: 0; - padding: 9px 38px 9px 16px; + padding: 10px 38px 10px 16px; background: rgba(0, 0, 0, 0.03); border-radius: 6px; border: none; @@ -128,6 +128,7 @@ font-style: normal; font-weight: 400; font-size: 12px; + line-height: 16px; letter-spacing: 0.25px; color: rgba(0, 0, 0, 0.38); overflow: hidden; From 51bc17a3e35e689cbfab8f97d589cb30f7a18796 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 12:07:06 +0200 Subject: [PATCH 5/9] Revert "Added size fix for audit log" This reverts commit 2823577c34be135fb11638f32a8ca52feb9e372d. --- .../audit-log/audit-log-details-dialog.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts index 9d983919fc..18bf1d4f03 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.ts @@ -105,14 +105,14 @@ export class AuditLogDetailsDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 18 * lines.length + 16; + newHeight = 16 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 10 * maxLineLength + 16; + newWidth = 8 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); From 37cf3dbb420d3e1d49b1fe030d707fea79adf0c0 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 12:07:07 +0200 Subject: [PATCH 6/9] Revert "Fixed sizing for codeblocks" This reverts commit c5e7b5f93d4eb0c65a0d7362c86c80c94e1eef77. --- .../home/components/event/event-content-dialog.component.ts | 4 ++-- .../lib/home-page/getting-started-widget.component.scss | 2 +- ui-ngx/src/app/shared/components/markdown.component.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts index fb7b026914..65b5be9b75 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.ts @@ -139,14 +139,14 @@ export class EventContentDialogComponent extends DialogComponent 0) { const lines = content.split('\n'); - newHeight = 18 * lines.length + 16; + newHeight = 16 * lines.length + 16; let maxLineLength = 0; lines.forEach((row) => { const line = row.replace(/\t/g, ' ').replace(/\n/g, ''); const lineLength = line.length; maxLineLength = Math.max(maxLineLength, lineLength); }); - newWidth = 10 * maxLineLength + 16; + newWidth = 8 * maxLineLength + 16; } // newHeight = Math.min(400, newHeight); this.renderer.setStyle(editorElement, 'minHeight', newHeight.toString() + 'px'); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 3e34cbdcd9..65eaf66c54 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -118,7 +118,7 @@ padding: 0; pre[class*=language-] { margin: 0; - padding: 10px 38px 10px 16px; + padding: 9px 38px 9px 16px; background: rgba(0, 0, 0, 0.03); border-radius: 6px; border: none; diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss index c47a78011b..0c5e310e07 100644 --- a/ui-ngx/src/app/shared/components/markdown.component.scss +++ b/ui-ngx/src/app/shared/components/markdown.component.scss @@ -370,7 +370,7 @@ } &.line-numbers { - padding: 10px 16px 10px 66px; + padding-left: 66px; & > code { span.line-numbers-rows { From 87d11926b8e6d50026f0f576e9f00d91bd306cfa Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 12:08:15 +0200 Subject: [PATCH 7/9] Only codeblocks fixes left --- .../widget/lib/home-page/getting-started-widget.component.scss | 1 - ui-ngx/src/app/shared/components/markdown.component.scss | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 65eaf66c54..2dcfdf7cd1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -128,7 +128,6 @@ font-style: normal; font-weight: 400; font-size: 12px; - line-height: 16px; letter-spacing: 0.25px; color: rgba(0, 0, 0, 0.38); overflow: hidden; diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss index 0c5e310e07..c47a78011b 100644 --- a/ui-ngx/src/app/shared/components/markdown.component.scss +++ b/ui-ngx/src/app/shared/components/markdown.component.scss @@ -370,7 +370,7 @@ } &.line-numbers { - padding-left: 66px; + padding: 10px 16px 10px 66px; & > code { span.line-numbers-rows { From fbb478e498d700b8bd5e406999c33fb3d0651d2c Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 18:14:35 +0200 Subject: [PATCH 8/9] Revert "Only codeblocks fixes left" This reverts commit 87d11926b8e6d50026f0f576e9f00d91bd306cfa. --- .../widget/lib/home-page/getting-started-widget.component.scss | 1 + ui-ngx/src/app/shared/components/markdown.component.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 2dcfdf7cd1..65eaf66c54 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -128,6 +128,7 @@ font-style: normal; font-weight: 400; font-size: 12px; + line-height: 16px; letter-spacing: 0.25px; color: rgba(0, 0, 0, 0.38); overflow: hidden; diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss index c47a78011b..0c5e310e07 100644 --- a/ui-ngx/src/app/shared/components/markdown.component.scss +++ b/ui-ngx/src/app/shared/components/markdown.component.scss @@ -370,7 +370,7 @@ } &.line-numbers { - padding: 10px 16px 10px 66px; + padding-left: 66px; & > code { span.line-numbers-rows { From aeaa377183b202767be037971526d11149cd8d78 Mon Sep 17 00:00:00 2001 From: mpetrov Date: Fri, 22 Nov 2024 18:18:38 +0200 Subject: [PATCH 9/9] Changed fixes approach in accordance with PR comments --- .../lib/home-page/getting-started-widget.component.scss | 2 +- ui-ngx/src/app/shared/components/markdown.component.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss index 65eaf66c54..e684c094d7 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss @@ -148,7 +148,7 @@ } p { margin: 0; - padding: 7px; + padding: 6px 7px; color: #305680; } div { diff --git a/ui-ngx/src/app/shared/components/markdown.component.scss b/ui-ngx/src/app/shared/components/markdown.component.scss index 0c5e310e07..a949499cd4 100644 --- a/ui-ngx/src/app/shared/components/markdown.component.scss +++ b/ui-ngx/src/app/shared/components/markdown.component.scss @@ -374,8 +374,8 @@ & > code { span.line-numbers-rows { - top: -12px; - bottom: -12px; + top: -11px; + bottom: -11px; left: -66px; width: 50px; border: none;