From 12fe45f7982fec92b39c8a981a0f42530e6c1c83 Mon Sep 17 00:00:00 2001 From: Malek Date: Mon, 30 Jul 2018 15:29:47 +0300 Subject: Add fonts and fix styles Issue-ID: SDC-1574 Change-Id: I8e15ebf436fa7cc293a0bf352ac365de5cc7a80c Signed-off-by: Malek --- .../main/frontend/resources/scss/features/_catalog.scss | 6 ++---- .../main/frontend/resources/scss/features/_general.scss | 3 +-- .../frontend/resources/scss/features/_inputOutput.scss | 14 +++++--------- .../main/frontend/resources/scss/features/_overview.scss | 7 +++---- 4 files changed, 11 insertions(+), 19 deletions(-) (limited to 'workflow-designer-ui/src/main/frontend/resources/scss/features') diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/features/_catalog.scss b/workflow-designer-ui/src/main/frontend/resources/scss/features/_catalog.scss index debb8b81..e46e84c1 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/features/_catalog.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/features/_catalog.scss @@ -23,15 +23,13 @@ align-items: center; padding: 25px 60px; &__total { - @include body-1; - @include semi-bold; + @include body-1-semibold; color: $dark-gray; } &__order { display: flex; &__label { - @include body-1; - @include semi-bold; + @include body-1-semibold; color: $dark-gray; } &__alphabetical { 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 f99b8aad..9189c87b 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 @@ -6,8 +6,7 @@ .general-page-title { height: 110px; line-height: 110px; - @include heading-1; - @include semi-bold; + @include heading-1-semibold; color: $dark-gray; } diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/features/_inputOutput.scss b/workflow-designer-ui/src/main/frontend/resources/scss/features/_inputOutput.scss index 45338039..68146f48 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/features/_inputOutput.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/features/_inputOutput.scss @@ -10,15 +10,13 @@ &__title { height: 110px; line-height: 110px; - @include heading-1; - @include semi-bold; + @include heading-1-semibold; color: $dark-gray; } &__header { display: flex; - @include body-1; - @include semi-bold; + @include body-1-semibold; &__right { flex: 1; display: flex; @@ -49,15 +47,14 @@ &__table { &__thead { background-color: $silver; - @include body-1; - @include semi-bold; + @include body-1-semibold; } } &__tr { display: flex; @include border(); - &:hover:not(.no-data) { + &:hover:not(&--no-hover) { background-color: $light-silver; } & + & { @@ -81,8 +78,7 @@ &--empty { padding: 20px; color: $dark-gray; - @include body-1; - @include semi-bold; + @include body-1-semibold; justify-content: center; } 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 b713b93f..f384017f 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,6 +1,5 @@ .overview-page { - @include body-1; - @include base-font-regular; + @include body-1-semibold; padding: 25px; .overview-content { @@ -112,7 +111,7 @@ @include version-page-box-shadow(); .version-tree-title-container { - @include base-font-semibold(); + @include body-1-semibold(); background-color: $light-silver; display: flex; align-items: center; @@ -183,7 +182,7 @@ height: 40px; background-color: $light-silver; - @include base-font-semibold(); + @include body-1-semibold(); @include version-page-sub-title(); padding: 15px 27px; -- cgit 1.2.3-korg