From 2210e984704b0913b655c4627cd2168a61ffbf8b Mon Sep 17 00:00:00 2001 From: Yarin Dekel Date: Thu, 2 Aug 2018 13:33:56 +0300 Subject: add errors and align style Issue-ID: SDC-1592 Change-Id: I2921291042ed1fe6327f6ff2e859605c153bbef5 Signed-off-by: Yarin Dekel Issue-ID: SDC-1592 Change-Id: I4b706c3a1024bfccb412b1463ee51145dedac7ce Signed-off-by: Yarin Dekel --- .../resources/scss/components/_customModal.scss | 13 ++-- .../resources/scss/components/_layout.scss | 6 +- .../resources/scss/features/_overview.scss | 2 +- .../features/version/create/CreateVersionView.jsx | 30 +++++---- .../CreateVersionView_snapshot-test.js.snap | 76 ++++++++++++---------- .../version/inputOutput/inputOutputSelectors.js | 28 ++++++++ .../version/versionController/VersionController.js | 4 +- .../versionController/VersionControllerView.jsx | 7 +- .../VersionControllerView_snapshot-test.js.snap | 2 +- .../versionControllerSelectors.js | 1 - .../versionController/views/ActionButtons.js | 13 +++- .../workflow/create/CreateWorkflowView.jsx | 38 ++++++----- .../CreateWorkflowView_snapshot-test.js.snap | 72 ++++++++++---------- .../OverviewView_snapshot-test.js.snap | 2 +- .../overview/__tests__/overviewReducer-test.js | 4 +- .../features/workflow/overview/overviewReducer.js | 2 +- .../src/shared/components/Description/index.js | 2 +- .../errorResponseHandler/errorResponseHandler.js | 3 +- 18 files changed, 181 insertions(+), 124 deletions(-) (limited to 'workflow-designer-ui/src') 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 2ee87387..fe8bd0cf 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,18 +1,21 @@ .sdc-modal { .custom-modal-wrapper { - padding: 35px 60px 20px 60px; width: auto; } + .form-custom-modal { + padding: 30px 35px 20px 35px; + + .sdc-input { + margin-bottom: 15px; + } + } + } .modal-action-bar { display: flex; justify-content: flex-end; - - button:first-child { - margin-right: 2em; - } } textarea.field-section.sdc-input__input { diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/components/_layout.scss b/workflow-designer-ui/src/main/frontend/resources/scss/components/_layout.scss index bcd07ebe..fc51e812 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/components/_layout.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/components/_layout.scss @@ -9,8 +9,12 @@ display: flex; flex-direction: column; } + + .custom-textarea { + resize: none; + } } #root { height: 100%; -} \ No newline at end of file +} 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 8cb6be74..67883fbb 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 @@ -1,5 +1,5 @@ .overview-page { - @include body-1-semibold; + @include body-1; padding: 25px; .overview-content { diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/create/CreateVersionView.jsx b/workflow-designer-ui/src/main/frontend/src/features/version/create/CreateVersionView.jsx index 080329e9..f3a2cccf 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/version/create/CreateVersionView.jsx +++ b/workflow-designer-ui/src/main/frontend/src/features/version/create/CreateVersionView.jsx @@ -61,20 +61,22 @@ class CreateVersionView extends Component { const { closeCreateVersionModal } = this.props; return (
-
- + +
+
diff --git a/workflow-designer-ui/src/main/frontend/src/features/version/create/__tests__/__snapshots__/CreateVersionView_snapshot-test.js.snap b/workflow-designer-ui/src/main/frontend/src/features/version/create/__tests__/__snapshots__/CreateVersionView_snapshot-test.js.snap index 25c7b932..08389c6e 100644 --- a/workflow-designer-ui/src/main/frontend/src/features/version/create/__tests__/__snapshots__/CreateVersionView_snapshot-test.js.snap +++ b/workflow-designer-ui/src/main/frontend/src/features/version/create/__tests__/__snapshots__/CreateVersionView_snapshot-test.js.snap @@ -5,55 +5,59 @@ exports[`Create new version snapshot renders correctly 1`] = ` onSubmit={[Function]} >
- - - Minor - - -
-
+ + + +
- description +
+ description +
+