dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13663 from LeoMorgan113/fix/custom-action-editor

Browse Source 
Style fix for custom action editor
This commit is contained in:
Igor Kulikov 2025-07-17 15:51:09 +03:00 committed by GitHub
commit 4c1bac5cf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.html
View File

@ -43,7 +43,7 @@
</div> </div>
<ng-template #fullscreenEditor> <ng-template #fullscreenEditor>
<div class="tb-fullscreen-panel tb-layout-fill flex flex-row"> <div class="tb-fullscreen-panel tb-layout-fill flex flex-row">
<div #leftPanel class="tb-split tb-content"> <div #leftPanel class="tb-split tb-content left-panel">
<tb-custom-action-pretty-resources-tabs [hasCustomFunction]="false" <tb-custom-action-pretty-resources-tabs [hasCustomFunction]="false"
[helpId]="helpId" [helpId]="helpId"
[action]="action" (actionUpdated)="onActionUpdated($event ? true : false)"> [action]="action" (actionUpdated)="onActionUpdated($event ? true : false)">

63
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/custom-action-pretty-editor.component.scss
View File

@ -19,25 +19,66 @@
padding: 8px; padding: 8px;
background-color: #fff; background-color: #fff;
.css-panel, .html-panel{
border-color: #c0c0c0;
border-width: 0 1px 1px 1px;
border-style: solid;
}
.tb-js-func-toolbar{
padding: 0 3px;
}
.tb-js-func {
&:not(.tb-fullscreen) {
&.tb-hide-brackets {
padding-bottom: 0;
}
}
}
.tb-fullscreen-panel { .tb-fullscreen-panel {
.tb-custom-action-editor-container { .tb-custom-action-editor-container {
height: 100%;
}
.css-panel, .html-panel{
border: none;
}
.left-panel, .right-panel{
height: calc(100% - 40px); height: calc(100% - 40px);
} }
.right-panel { .right-panel {
padding-top: 8px; padding: 8px 0 0;
padding-left: 3px;
} }
tb-js-func .tb-js-func-panel { .tb-js-func {
.tb-js-func-panel {
box-sizing: border-box; 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 { .mat-mdc-tab-group {
.mat-mdc-tab-body-wrapper { .mat-mdc-tab-body-wrapper {
height: 100%; height: 100%;
.mat-mdc-tab-body { .mat-mdc-tab-body {
height: 100%; height: 100%;
& > div { & > div {
height: 100%; height: 100%;
} }
@ -70,7 +111,7 @@
.tb-split.tb-split-horizontal, .tb-split.tb-split-horizontal,
.gutter.gutter-horizontal { .gutter.gutter-horizontal {
float: left; float: left;
height: 100%; height: calc(100% - 40px);
} }
.tb-action-expand-button { .tb-action-expand-button {
@ -81,20 +122,7 @@
&.tb-fullscreen-editor { &.tb-fullscreen-editor {
position: relative; position: relative;
right: 0; 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 { .tb-custom-action-editor {
@ -105,3 +133,4 @@
} }