From 8fb9e4968989bafa02dd9e1a0f040c12f69c51fb Mon Sep 17 00:00:00 2001 From: LeoMorgan113 Date: Tue, 1 Jul 2025 16:32:49 +0300 Subject: [PATCH 1/4] Style fix for custom action editor --- ...custom-action-pretty-editor.component.scss | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss index 002ccbeeb3..6db246723f 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss @@ -19,6 +19,27 @@ padding: 8px; background-color: #fff; + .tb-custom-action-editor-container { + border: none; + } + + .tb-js-func-toolbar{ + padding: 0 3px; + } + + .tb-js-func { + &:not(.tb-fullscreen) { + &.tb-hide-brackets { + padding-bottom: 0; + } + } + + .tb-js-func-panel { + border: none; + border-top: 1px solid #c0c0c0; + } + } + .tb-fullscreen-panel { .tb-custom-action-editor-container { height: calc(100% - 40px); @@ -36,14 +57,46 @@ .mat-mdc-tab-group { .mat-mdc-tab-body-wrapper { height: 100%; + .mat-mdc-tab-body { height: 100%; + & > div { height: 100%; } } } } + + .right-panel{ + padding: 8px 0 25px; + } + + .tb-custom-action-editor-container { + border: none; + border-bottom: 1px solid #c0c0c0; + } + + .tb-js-func { + &.fill-height { + .tb-js-func-toolbar{ + padding: 0 5px; + } + &:not(.tb-fullscreen) { + &.tb-hide-brackets { + padding-bottom: 15px; + } + } + + &.tb-hide-brackets { + .tb-js-func-panel { + border: none; + border-top: 1px solid #c0c0c0; + border-bottom: 1px solid #c0c0c0; + } + } + } + } } .tb-split { From 7c29d2a5d7a2a50f9e8daeb9ed29dca6758a3632 Mon Sep 17 00:00:00 2001 From: LeoMorgan113 Date: Tue, 8 Jul 2025 13:23:06 +0300 Subject: [PATCH 2/4] Added borders in a preview mode --- .../action/custom-action-pretty-editor.component.scss | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss index 6db246723f..2562d6c994 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss @@ -19,8 +19,10 @@ padding: 8px; background-color: #fff; - .tb-custom-action-editor-container { - border: none; + .css-panel, .html-panel{ + border-color: #c0c0c0; + border-width: 0 1px 1px 1px; + border-style: solid; } .tb-js-func-toolbar{ @@ -35,8 +37,7 @@ } .tb-js-func-panel { - border: none; - border-top: 1px solid #c0c0c0; + border: 1px solid #c0c0c0; } } @@ -72,7 +73,7 @@ padding: 8px 0 25px; } - .tb-custom-action-editor-container { + .css-panel, .html-panel{ border: none; border-bottom: 1px solid #c0c0c0; } From 000c42963a53e89d4633f08ad2f13e909c274889 Mon Sep 17 00:00:00 2001 From: LeoMorgan113 Date: Wed, 9 Jul 2025 11:19:44 +0300 Subject: [PATCH 3/4] Blocks and gutter aligned, removed extra borders --- ...custom-action-pretty-editor.component.html | 2 +- ...custom-action-pretty-editor.component.scss | 75 +++++++------------ 2 files changed, 28 insertions(+), 49 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html index 3d2e69e210..3b2c14c539 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html @@ -43,7 +43,7 @@
-
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss index 2562d6c994..c9173bbc1a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss @@ -43,16 +43,37 @@ .tb-fullscreen-panel { .tb-custom-action-editor-container { + height: 100%; + } + + .css-panel, .html-panel{ + border: none; + } + + .left-panel, .right-panel{ height: calc(100% - 40px); } .right-panel { - padding-top: 8px; - padding-left: 3px; + padding: 8px 0 0; } - tb-js-func .tb-js-func-panel { - box-sizing: border-box; + .tb-js-func { + .tb-js-func-panel { + box-sizing: border-box; + } + &.fill-height { + .tb-js-func-toolbar{ + padding: 0 5px; + } + + &.tb-hide-brackets { + .tb-js-func-panel { + border: none; + border-top: 1px solid #c0c0c0; + } + } + } } .mat-mdc-tab-group { @@ -68,36 +89,6 @@ } } } - - .right-panel{ - padding: 8px 0 25px; - } - - .css-panel, .html-panel{ - border: none; - border-bottom: 1px solid #c0c0c0; - } - - .tb-js-func { - &.fill-height { - .tb-js-func-toolbar{ - padding: 0 5px; - } - &:not(.tb-fullscreen) { - &.tb-hide-brackets { - padding-bottom: 15px; - } - } - - &.tb-hide-brackets { - .tb-js-func-panel { - border: none; - border-top: 1px solid #c0c0c0; - border-bottom: 1px solid #c0c0c0; - } - } - } - } } .tb-split { @@ -124,7 +115,7 @@ .tb-split.tb-split-horizontal, .gutter.gutter-horizontal { float: left; - height: 100%; + height: calc(100% - 40px); } .tb-action-expand-button { @@ -135,20 +126,7 @@ &.tb-fullscreen-editor { position: relative; right: 0; - /* .mat-mdc-button { - .mat-icon { - margin-right: 5px; - } - } */ } - - /* .mat-mdc-button { - min-width: 36px; - padding: 0; - .mat-icon { - margin-right: 0; - } - } */ } .tb-custom-action-editor { @@ -159,3 +137,4 @@ } + From aaea558e79d6bb39e2b8f86b8a7704016b139787 Mon Sep 17 00:00:00 2001 From: LeoMorgan113 Date: Wed, 9 Jul 2025 11:33:47 +0300 Subject: [PATCH 4/4] Removed extra style --- .../common/action/custom-action-pretty-editor.component.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss index c9173bbc1a..f0e09589ea 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss @@ -35,10 +35,6 @@ padding-bottom: 0; } } - - .tb-js-func-panel { - border: 1px solid #c0c0c0; - } } .tb-fullscreen-panel {