From fcb5d6ecf0844e31122557eb72609d8cc108eea3 Mon Sep 17 00:00:00 2001 From: Gabor PEK Date: Mon, 12 Mar 2018 14:12:50 +0100 Subject: [PATCH] Import variables.scss in scss files used in shadow DOM --- src/app/dashboard/dashboard.component.scss | 16 +++------------- src/app/header/header.component.scss | 8 +------- src/app/messages/messages.component.scss | 20 +------------------- src/app/webide/webide.component.scss | 16 +--------------- src/assets/scss/_main.scss | 2 -- src/assets/scss/_variables.scss | 2 ++ 6 files changed, 8 insertions(+), 56 deletions(-) diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index 61b2feb..25c25fa 100755 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -1,17 +1,8 @@ -$space: 24px; -$small: 0.75 * $space; - - -$tao-navbar-height: 67px; - -$tao-plum-900: #272F4C; -$tao-gray-50: #FAFAFA; -$tao-gray-100: #F2F2F2; -$tao-gray-500: #555555; +@import "../../assets/scss/variables.scss"; // Change this to switch template. Options: 'default', 'vraw', 'hraw' -$layout-template: 'hraw'; +$layout-template: 'default'; $default-layout: ( 'header': (1, 2, 1, 2), @@ -79,7 +70,6 @@ $layout: ( .tfw-header { padding: $small; background-color: $tao-gray-50; - height: $tao-navbar-height; } .tfw-messages { @@ -104,7 +94,7 @@ $layout: ( } .tfw-terminal { - border: 1px solid $tao-plum-900; + border: 1px solid $tao-gray-500; border-left: 0; border-right: 0; border-bottom: 0; diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 50be1e1..675dad1 100755 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -1,10 +1,4 @@ -$tao-blue-500: #277EEC; -$font-size-base: 14px; -$font-size-h3: floor(($font-size-base * 1.3)); - -$tao-navbar-height: 67px; - -$company-logo-width: 130px; +@import "../../assets/scss/variables.scss"; .tfw-header-title { color: $tao-blue-500; diff --git a/src/app/messages/messages.component.scss b/src/app/messages/messages.component.scss index 02f03a1..08869e0 100755 --- a/src/app/messages/messages.component.scss +++ b/src/app/messages/messages.component.scss @@ -1,20 +1,4 @@ -$space: 24px; - -$small: 0.75 * $space; -$tiny: 0.5 * $space; -$hair: 0.25 * $space; - - -$tao-blue-500: #277EEC; -$tao-gray-100: #F2F2F2; - -$tao-panel-border-radius-sm: 8px; -$tao-navbar-height: 67px; - - -$font-size-tiny: 12px; -$font-size-base: 14px; - +@import "../../assets/scss/variables.scss"; .tfw-grid-header-messages { @@ -23,8 +7,6 @@ $font-size-base: 14px; } .tfw-messages-main { - - h5 { margin-bottom: $small; color: $tao-blue-500; diff --git a/src/app/webide/webide.component.scss b/src/app/webide/webide.component.scss index 8800eb8..5a52260 100644 --- a/src/app/webide/webide.component.scss +++ b/src/app/webide/webide.component.scss @@ -1,18 +1,4 @@ -$space: 24px; -$small: 0.75 * $space; -$tiny: 0.5 * $space; - -$tao-navbar-height: 67px; - -$tao-bright-green-100: #c5f2e4; -$tao-bright-green-200: #a0ead3; - -$tao-warm-yellow-200: #FFE0A9; -$tao-warm-yellow-600: #E59C3C; - -$tao-plum-200: #BEC7F3; -$tao-plum-900: #272F4C; -$tao-red-500: #FF5252; +@import "../../assets/scss/variables.scss"; .tfw-grid-webide-statusbar { display: grid; diff --git a/src/assets/scss/_main.scss b/src/assets/scss/_main.scss index abc22dc..a62466b 100644 --- a/src/assets/scss/_main.scss +++ b/src/assets/scss/_main.scss @@ -1,5 +1,3 @@ - - @import 'variables', 'grid'; diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss index 7b83e9c..874a06f 100644 --- a/src/assets/scss/_variables.scss +++ b/src/assets/scss/_variables.scss @@ -157,3 +157,5 @@ $font-size-h5: floor(($font-size-base * 1.1)); $tao-navbar-height: 67px; +$company-logo-width: 130px; +