From 4611ecf0928196aabfdb20b9dbeb89e5977ac293 Mon Sep 17 00:00:00 2001 From: Yarin Dekel Date: Tue, 21 Aug 2018 12:12:47 +0300 Subject: bugRelease1 after changes Issue-ID: SDC-1655 Change-Id: I0e049a77751c9df930d9d70bbe7ea6697df7a573 Signed-off-by: Yarin Dekel --- .../resources/scss/common/_customVariables.scss | 82 ++-------------------- .../frontend/resources/scss/common/_utils.scss | 5 ++ 2 files changed, 9 insertions(+), 78 deletions(-) (limited to 'workflow-designer-ui/src/main/frontend/resources/scss/common') diff --git a/workflow-designer-ui/src/main/frontend/resources/scss/common/_customVariables.scss b/workflow-designer-ui/src/main/frontend/resources/scss/common/_customVariables.scss index 9472fe68..1a532c88 100644 --- a/workflow-designer-ui/src/main/frontend/resources/scss/common/_customVariables.scss +++ b/workflow-designer-ui/src/main/frontend/resources/scss/common/_customVariables.scss @@ -1,90 +1,16 @@ $cursor-disabled: not-allowed !default; $cursor-pointer: pointer; -$heading-font-1: 28px; -$heading-font-2: 24px; -$heading-font-3: 20px; -$heading-font-4: 16px; -$heading-font-5: 14px; - -$body-font-1: 14px; -$body-font-2: 13px; -$body-font-3: 12px; -$body-font-4: 10px; - -@mixin regular-font() { - font-family: OpenSans-Regular, Arial, sans-serif; - font-style: normal; - font-weight: 400; -} - -@mixin italic-font() { - font-family: OpenSans-Italic, OpenSans-Regular, Arial, sans-serif; - font-style: italic; - font-weight: 400; -} - -@mixin semibold-font() { - font-family: OpenSans-Semibold, Arial, sans-serif; - font-style: normal; - font-weight: 600; -} - -@mixin body-1() { - @include regular-font; - font-size: $body-font-1; -} - -@mixin body-1-semibold() { - @include semibold-font; +@mixin body-1-emphasis() { + @include base-font-semibold; font-size: $body-font-1; } -@mixin body-2() { - @include regular-font; - font-size: $body-font-2; -} - -@mixin body-2-semibold() { - @include semibold-font; - font-size: $body-font-2; -} - -@mixin body-3() { - @include regular-font; - font-size: $body-font-3; -} - -@mixin body-4() { - @include regular-font; - font-size: $body-font-4; -} - -@mixin heading-1() { - @include regular-font; - font-size: $heading-font-1; -} - -@mixin heading-1-semibold() { - @include semibold-font; +@mixin heading-1-emphasis() { + @include base-font-semibold; font-size: $heading-font-1; } -@mixin heading-4() { - @include regular-font; - font-size: $heading-font-4; -} - -@mixin heading-4-semibold() { - @include semibold-font; - font-size: $heading-font-4; -} - -@mixin heading-5() { - @include regular-font; - font-size: $heading-font-5; -} - .flex { display: flex; flex: 1; 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 3cf90bc9..7a35b38c 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 @@ -74,6 +74,11 @@ $browserPrefixes: webkit moz o ms; @include prefix(box-shadow, $value, $box-shadow-radius-prefix); } +@mixin sticky($value) { + position: sticky; + top: $value; +} + @mixin text-shadow($value) { @include prefix(text-shadow, $value, $text-shadow-radius-prefix); } -- cgit 1.2.3-korg