From aface0df975ad060a6fe76a02d760d4102dcbce2 Mon Sep 17 00:00:00 2001 From: Yarin Dekel Date: Tue, 31 Jul 2018 10:10:07 +0300 Subject: fix css test and IO squash Issue-ID: SDC-1575 Change-Id: I89017be62905c5e12848057b3c07f113396db1b5 Signed-off-by: Yarin Dekel --- .../main/frontend/resources/scss/common/_utils.scss | 1 - .../resources/scss/components/_customModal.scss | 7 ++++++- .../resources/scss/components/_versionController.scss | 11 +++++------ .../frontend/resources/scss/features/_general.scss | 3 ++- .../frontend/resources/scss/features/_overview.scss | 18 ++++++++++++------ 5 files changed, 25 insertions(+), 15 deletions(-) (limited to 'workflow-designer-ui/src/main/frontend/resources') diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/common/_utils.scss b/workflow-designer-ui/src/main/frontend/resources/scss/common/_utils.scss index 99b1ff5d..3cf90bc9 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/common/_utils.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/common/_utils.scss @@ -1,5 +1,4 @@ - /* Prefix */ $box-sizing-prefix: webkit moz spec; diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/components/_customModal.scss b/workflow-designer-ui/src/main/frontend/resources/scss/components/_customModal.scss index 48cd4cff..2ee87387 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/components/_customModal.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/components/_customModal.scss @@ -1,6 +1,6 @@ .sdc-modal { .custom-modal-wrapper { - padding: 35px 60px 60px 60px; + padding: 35px 60px 20px 60px; width: auto; } @@ -13,4 +13,9 @@ button:first-child { margin-right: 2em; } +} + +textarea.field-section.sdc-input__input { + height: 75px; + padding-top: 5px; } \ No newline at end of file diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/components/_versionController.scss b/workflow-designer-ui/src/main/frontend/resources/scss/components/_versionController.scss index eaa3d7dd..45985a65 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/components/_versionController.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/components/_versionController.scss @@ -23,14 +23,12 @@ justify-content: space-between; align-items: center; padding-left: 16px; - padding-right: 40px; + padding-right: 100px; border-left: 1px solid #eaeaea; .vc-separator { border-left: 1px solid $silver; height: 37px; - margin-left: 5px; - margin-right: 5px; } .version-status-container { @@ -119,7 +117,7 @@ } .certifyBtn { - margin-left: 10px; + margin-left: 20px; } .version-control-buttons { @@ -130,12 +128,13 @@ display: flex; align-items: center; height: 70px; + padding: 10px; - &:hover:not(.disabled) { + &:hover { background-color: $silver; } - &:active:not(.disabled) { + &:active { background-color: $light-gray; } diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/features/_general.scss b/workflow-designer-ui/src/main/frontend/resources/scss/features/_general.scss index 9189c87b..6e8b3522 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/features/_general.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/features/_general.scss @@ -1,6 +1,6 @@ .general-page { @include body-1; - padding: 0 100px 20px 100px; + padding: 0 131px 20px 100px; background-color: #fff; .general-page-title { @@ -18,6 +18,7 @@ .description-part textarea { height: 200px; + padding-top: 5px; } .version-info-part { diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/features/_overview.scss b/workflow-designer-ui/src/main/frontend/resources/scss/features/_overview.scss index f384017f..8cb6be74 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/features/_overview.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/features/_overview.scss @@ -13,6 +13,7 @@ .description-part textarea{ height: 200px; + padding-top: 5px; } .save-description { @@ -26,7 +27,7 @@ padding: 20px; box-sizing: border-box; .label { - @include body-3; + @include body-1; margin-bottom: 5px; } .value { @@ -70,6 +71,7 @@ .svg-icon-wrapper { justify-content: flex-start; + margin: 5px; } .create-new-version { @@ -125,9 +127,11 @@ } .tree-view { - //background-color: $white; flex: 1; - + border-left: 1px solid $silver; + &:last-child { + border-bottom: 1px solid $silver; + } .node:not(.selectedNode):hover { .outer-circle, .inner-circle { transform: scale(1.1); @@ -145,11 +149,13 @@ .version-list-items { @extend .flex-column; + .item-version, .item-status { + font-size: 12px; + font-weight: 600; + } .version-item-row { - border-bottom: 1px solid $silver; - &:last-child { - border-bottom: none; + border-bottom: 1px solid $silver; } } } -- cgit 1.2.3-korg