From eb57d1efc197968a4073b331b2dc8f40d8109847 Mon Sep 17 00:00:00 2001 From: vasraz Date: Tue, 23 Mar 2021 19:17:37 +0000 Subject: Fix 46 CRITICAL BUGs Change-Id: Id354491665a1d8c25a7c1f3e83fcb4d146ca2f37 Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3529 --- ...ilities-filter-properties-editor.component.less | 12 +- .../graph/composition-graph.component.less | 4 +- .../connection-properties-view.component.less | 6 +- .../create-input-row.component.less | 3 +- .../create-interface-operation.component.less | 7 +- .../input-param-row/input-param-row.component.less | 70 ++--- .../interface-operation-handler.component.less | 292 +++++++++++---------- .../composition/palette/palette.component.less | 20 +- .../panel/composition-panel.component.less | 35 +-- 9 files changed, 233 insertions(+), 216 deletions(-) (limited to 'catalog-ui/src/app/ng2/pages/composition') diff --git a/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.less b/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.less index 188fb7b5ef..4ceb43ef5d 100644 --- a/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/capabilities-filter-properties-editor/capabilities-filter-properties-editor.component.less @@ -14,6 +14,7 @@ .i-sdc-form-item { width: 250px; + &.operation { width: 60px; } @@ -22,20 +23,25 @@ .rule-builder-content { display: flex; align-items: flex-end; + .rule-input-field { flex: 1; + &:not(:last-of-type) { margin-right: 20px; } - &.operator{ + + &.operator { width: 55px; flex: 0 1 auto; } + &.assigned-value-field { margin-bottom: 10px; } - /deep/ ui-element-dropdown select, - /deep/ ui-element-input input { + + /deep/ .ui-element-dropdown select, + /deep/ .ui-element-input input { height: 30px; } } diff --git a/catalog-ui/src/app/ng2/pages/composition/graph/composition-graph.component.less b/catalog-ui/src/app/ng2/pages/composition/graph/composition-graph.component.less index b3e5ef3a0c..aebea3bea6 100644 --- a/catalog-ui/src/app/ng2/pages/composition/graph/composition-graph.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/graph/composition-graph.component.less @@ -1,4 +1,4 @@ -:host(composition-graph) { +:host(.composition-graph) { flex: 1; padding-top: 53px; } @@ -34,7 +34,7 @@ right: 310px; } - ng2-zone-container { + .ng2-zone-container { display: flex; margin-left: 10px; } diff --git a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/connection-properties-view/connection-properties-view.component.less b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/connection-properties-view/connection-properties-view.component.less index 07f9aa2135..87e9ae1e03 100644 --- a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/connection-properties-view/connection-properties-view.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/connection-properties-view/connection-properties-view.component.less @@ -1,4 +1,4 @@ -connection-wizard-header { - display: block; - margin-bottom: 15px; +.connection-wizard-header { + display: block; + margin-bottom: 15px; } diff --git a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-input-row/create-input-row.component.less b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-input-row/create-input-row.component.less index 316d49e406..2d77d9ae4a 100644 --- a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-input-row/create-input-row.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-input-row/create-input-row.component.less @@ -24,7 +24,7 @@ align-items: center; justify-content: center; - svg-icon { + .svg-icon { position: relative; right: -3px; @@ -34,7 +34,6 @@ } } - .cell { min-height: 50px; padding: 10px; diff --git a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-interface-operation.component.less b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-interface-operation.component.less index 4c7f8aba48..4c72281626 100644 --- a/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-interface-operation.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/graph/connection-wizard/create-interface-operation/create-interface-operation.component.less @@ -44,7 +44,7 @@ height: 38px; line-height: 35px; - svg-icon { + .svg-icon { margin: 13px 6px; } } @@ -142,11 +142,13 @@ position: relative; top: 2px; } + /deep/ .tooltip-inner { padding: 2px; max-width: 270px; font-size: 11px; } + &.remove { padding: 10px; font-size: 10px; @@ -204,7 +206,8 @@ display: flex; justify-content: flex-end; align-items: center; - sdc-button { + + .sdc-button { margin: 0 5px; } } diff --git a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/input-param-row/input-param-row.component.less b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/input-param-row/input-param-row.component.less index 12eacc6473..55fb59c526 100644 --- a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/input-param-row/input-param-row.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/input-param-row/input-param-row.component.less @@ -21,52 +21,52 @@ @import '../../../../../../../assets/styles/variables.less'; .remove { - display: flex; - align-items: center; - justify-content: center; + display: flex; + align-items: center; + justify-content: center; - svg-icon { - position: relative; - right: -3px; + .svg-icon { + position: relative; + right: -3px; - &:hover { - cursor: pointer; - } + &:hover { + cursor: pointer; } + } } .cell { - min-height: 50px; - padding: 10px; - display: flex; - align-items: center; + min-height: 50px; + padding: 10px; + display: flex; + align-items: center; - > * { - flex-basis: 100%; - } + > * { + flex-basis: 100%; + } - /deep/ select { - height: 30px; - } + /deep/ select { + height: 30px; + } - input { - height: 30px; - border: none; - padding-left: 10px; - } + input { + height: 30px; + border: none; + padding-left: 10px; + } - select { - width: 100%; - } + select { + width: 100%; + } - &.field-property { - &:last-child { - flex: 1; - } + &.field-property { + &:last-child { + flex: 1; + } - .no-properties-error { - color: @func_color_q; - font-style: italic; - } + .no-properties-error { + color: @func_color_q; + font-style: italic; } + } } diff --git a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.less b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.less index 8bbed9de02..3d44cad740 100644 --- a/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/interface-operatons/operation-creator/interface-operation-handler.component.less @@ -22,179 +22,181 @@ @import '../../../../../../assets/styles/override.less'; .operation-handler { - font-family: @font-opensans-regular; - user-select: none; - padding-top: 12px; - padding-bottom: 20px; - - .i-sdc-form-label { - font-size: 12px; - } - - .w-sdc-form .i-sdc-form-item { - margin-bottom: 15px; - } - - textarea { - min-height: 74px; - margin-bottom: 18px; - } - - /deep/ .sdc-dropdown__component-container { - .sdc-dropdown__header { - height: 38px; - line-height: 35px; - - svg-icon { - margin: 13px 6px; - } - } + font-family: @font-opensans-regular; + user-select: none; + padding-top: 12px; + padding-bottom: 20px; + + .i-sdc-form-label { + font-size: 12px; + } + + .w-sdc-form .i-sdc-form-item { + margin-bottom: 15px; + } + + textarea { + min-height: 74px; + margin-bottom: 18px; + } + + /deep/ .sdc-dropdown__component-container { + .sdc-dropdown__header { + height: 38px; + line-height: 35px; + + .svg-icon { + margin: 13px 6px; + } } + } - /deep/ .sdc-input { - margin-bottom: 0; + /deep/ .sdc-input { + margin-bottom: 0; - .sdc-input__input { - height: 38px; - } + .sdc-input__input { + height: 38px; } + } - .side-by-side { - display: flex; - - .form-item { - flex: 1; + .side-by-side { + display: flex; - &:first-child { - margin-right: 14px; - flex-basis: 37%; - flex-grow: 0; - flex-shrink: 0; - } + .form-item { + flex: 1; - &:nth-child(3) { - margin-left: 14px; - flex: 0.4; - } + &:first-child { + margin-right: 14px; + flex-basis: 37%; + flex-grow: 0; + flex-shrink: 0; + } - .i-sdc-form-file-upload { - height: 37px; - margin-bottom: 0; + &:nth-child(3) { + margin-left: 14px; + flex: 0.4; + } - .i-sdc-form-file-name { - padding: 8px 10px; - } + .i-sdc-form-file-upload { + height: 37px; + margin-bottom: 0; - .i-sdc-form-file-upload-x-btn { - top: 13px; - } + .i-sdc-form-file-name { + padding: 8px 10px; + } - .file-upload-browse-btn { - height: 100%; - padding: 7px 6px; - z-index: 1; - } - } + .i-sdc-form-file-upload-x-btn { + top: 13px; + } + .file-upload-browse-btn { + height: 100%; + padding: 7px 6px; + z-index: 1; } - } + } - .archive-warning { - font-family: @font-opensans-bold; - color: @main_color_i; } - - .no-workflow-warning { - font-family: @font-opensans-bold; - color: @sdcui_color_red; - float: right; + } + + .archive-warning { + font-family: @font-opensans-bold; + color: @main_color_i; + } + + .no-workflow-warning { + font-family: @font-opensans-bold; + color: @sdcui_color_red; + float: right; + } + + .input-param-title { + font-size: 16px; + text-transform: uppercase; + } + + .separator-buttons { + display: flex; + justify-content: space-between; + margin-top: 10px; + + .add-param-link { + &:not(.disabled):hover { + cursor: pointer; + } } - .input-param-title { - font-size: 16px; - text-transform: uppercase; + .tab { + width: 84px; + text-align: center; } + } - .separator-buttons { - display: flex; - justify-content: space-between; - margin-top: 10px; + .generic-table { + max-height: 244px; + min-height: 91px; + background: @main_color_p; + + .header-row .header-cell { + .info-icon { + float: right; + position: relative; + top: 2px; + } + + /deep/ .tooltip-inner { + padding: 2px; + max-width: 270px; + font-size: 11px; + } + + &.remove { + padding: 10px; + font-size: 10px; + } + } - .add-param-link { - &:not(.disabled):hover { - cursor: pointer; - } + .data-row { + &.empty-msg { + .bold-message { + font-family: @font-opensans-bold; } - .tab { - width: 84px; - text-align: center; + :first-child { + &:not(:only-child) { + margin: 6px 0; + } } + + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 14px; + } } - .generic-table { - max-height: 244px; - min-height: 91px; - background: @main_color_p; - - .header-row .header-cell { - .info-icon { - float: right; - position: relative; - top: 2px; - } - /deep/ .tooltip-inner { - padding: 2px; - max-width: 270px; - font-size: 11px; - } - &.remove { - padding: 10px; - font-size: 10px; - } - } + /deep/ .cell { + &.field-input-name, &.field-input-value { + flex: 1; + } - .data-row { - &.empty-msg { - .bold-message { - font-family: @font-opensans-bold; - } - - :first-child { - &:not(:only-child) { - margin: 6px 0; - } - } - - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding: 14px; - } + &.field-property { + &, &:last-child { + flex: 1; } + } - /deep/ .cell { - &.field-input-name, &.field-input-value{ - flex: 1; - } - - &.field-property { - &, &:last-child { - flex: 1; - } - } - - &.field-mandatory { - flex: 0.5; - text-align: center; - } - - &.remove { - min-width: 40px; - max-width: 40px; - } - } + &.field-mandatory { + flex: 0.5; + text-align: center; + } + &.remove { + min-width: 40px; + max-width: 40px; + } } + + } } diff --git a/catalog-ui/src/app/ng2/pages/composition/palette/palette.component.less b/catalog-ui/src/app/ng2/pages/composition/palette/palette.component.less index 37461ba1c5..b7533cc664 100644 --- a/catalog-ui/src/app/ng2/pages/composition/palette/palette.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/palette/palette.component.less @@ -1,19 +1,20 @@ @import "./../../../../../assets/styles/override"; -:host(composition-palette) { - display:flex; +:host(.composition-palette) { + display: flex; flex: 0 0 244px; } -sdc-loader.inactive { - display:none; +.sdc-loader.inactive { + display: none; } :host ::ng-deep .sdc-filter-bar .sdc-input { - margin-bottom:0px; + margin-bottom: 0px; } + :host ::ng-deep .sdc-loader-wrapper { - position:static; + position: static; } .composition-palette-component { @@ -22,7 +23,7 @@ sdc-loader.inactive { overflow-x: hidden; display: flex; flex-direction: column; - position:relative; + position: relative; width: 244px; box-shadow: 7px -3px 6px -8px @sdcui_color_gray; @@ -31,6 +32,7 @@ sdc-loader.inactive { line-height: 40px; padding: 0 17px; color: @sdcui_color_white; + .palette-elements-count-value { float: right; } @@ -41,19 +43,23 @@ sdc-loader.inactive { .no-elements-found { padding-left: 40px; } + /deep/ .palette-category { display: flex; margin: 0px; + .sdc-accordion-header { background-color: @sdcui_color_silver; margin: 0px; line-height: 40px; padding: 0px 10px; } + .sdc-accordion-body { padding: 0px; } } + .palette-subcategory { padding: 0 10px; background-color: @sdcui_color_lighter-silver; diff --git a/catalog-ui/src/app/ng2/pages/composition/panel/composition-panel.component.less b/catalog-ui/src/app/ng2/pages/composition/panel/composition-panel.component.less index 124d606079..9a39871e7a 100644 --- a/catalog-ui/src/app/ng2/pages/composition/panel/composition-panel.component.less +++ b/catalog-ui/src/app/ng2/pages/composition/panel/composition-panel.component.less @@ -2,27 +2,28 @@ @import '../../../../../assets/styles/mixins_old'; :host ::ng-deep .sdc-loader-wrapper { - position:static; + position: static; } .component-details-panel-tabs { - flex: 1; - display:flex; - overflow:hidden; - } + flex: 1; + display: flex; + overflow: hidden; +} -.component-details-panel-tabs /deep/ sdc-tabs { - display:flex; - flex-direction:column; - width: 100%; +.component-details-panel-tabs /deep/ .sdc-tabs { + display: flex; + flex-direction: column; + width: 100%; - /deep/ sdc-tab { - display: flex; - flex-direction: column; - overflow-y: auto; - } - .svg-icon-wrapper.label-placement-left .svg-icon-label { - margin-right: 0; - } + /deep/ .sdc-tab { + display: flex; + flex-direction: column; + overflow-y: auto; + } + + .svg-icon-wrapper.label-placement-left .svg-icon-label { + margin-right: 0; + } } -- cgit 1.2.3-korg