From 746d18680e95d07d0dbfd7f4a34918766c508271 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Sat, 29 Jul 2017 16:00:27 +0300 Subject: [PATCH] fix(demo): styling default version --- .../@theme/components/footer/footer.component.scss | 10 +++++++++- .../dashboard/status-card/status-card.component.scss | 11 ++++++++--- .../pages/tables/smart-table/smart-table.component.ts | 2 +- .../pages/ui-features/buttons/buttons.component.scss | 6 +++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss index 02bcfc07..b64ab82e 100644 --- a/src/app/@theme/components/footer/footer.component.scss +++ b/src/app/@theme/components/footer/footer.component.scss @@ -1,4 +1,6 @@ -:host { +@import '../../../@theme/styles/variables'; + +@include nga-install-component() { width: 100%; display: flex; justify-content: space-between; @@ -9,6 +11,12 @@ a { padding: 0.4rem; + color: nga-theme(color-fg); + transition: color ease-out 0.1s; + + &:hover { + color: nga-theme(color-fg-heading); + } } } } diff --git a/src/app/pages/dashboard/status-card/status-card.component.scss b/src/app/pages/dashboard/status-card/status-card.component.scss index 63c0b5ab..7ce58dc4 100644 --- a/src/app/pages/dashboard/status-card/status-card.component.scss +++ b/src/app/pages/dashboard/status-card/status-card.component.scss @@ -7,7 +7,6 @@ align-items: center; height: 6rem; overflow: visible; - color: nga-theme(card-fg-heading); $bevel: btn-hero-bevel(nga-theme(card-bg)); $shadow: btn-hero-shadow(); @@ -24,6 +23,7 @@ font-size: 4em; border-radius: $border-radius 0 0 $border-radius; transition: all 0.1s ease-out, color 0s; + color: nga-theme(color-white); &.primary { @include btn-hero-primary-gradient(); @@ -89,6 +89,8 @@ color: nga-theme(card-fg); .icon-container { + color: nga-theme(card-fg); + &.primary, &.success, &.info, &.warning { box-shadow: none; background-image: linear-gradient(to right, transparent, transparent); @@ -98,7 +100,7 @@ .details { border-left: 1px solid nga-theme(separator); } - .status { + .title { color: nga-theme(card-fg); } } @@ -111,16 +113,19 @@ padding-left: 1.5rem; border-left: 1px solid transparent; } + .title { font-family: nga-theme(font-secondary); font-size: 1.5rem; font-weight: nga-theme(font-weight-bolder); + color: nga-theme(card-fg-heading); } + .status { font-size: 1.125rem; font-weight: nga-theme(font-weight-light); text-transform: uppercase; - color: nga-theme(card-fg-heading); + color: nga-theme(card-fg); } } } diff --git a/src/app/pages/tables/smart-table/smart-table.component.ts b/src/app/pages/tables/smart-table/smart-table.component.ts index f44a325a..bd699484 100644 --- a/src/app/pages/tables/smart-table/smart-table.component.ts +++ b/src/app/pages/tables/smart-table/smart-table.component.ts @@ -55,7 +55,7 @@ export class SmartTableComponent { source: LocalDataSource = new LocalDataSource(); constructor(private service: SmartTableService) { - let data = this.service.getData(); + const data = this.service.getData(); this.source.load(data); } diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss index e14cd40c..527a8e52 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -7,13 +7,13 @@ $button-border-radius: 12px; .container-title { - color: nga-theme(color-fg-hint); + color: nga-theme(color-fg); font-family: nga-theme(font-secondary); margin-bottom: 0.5rem; } .header { - color: white; + color: nga-theme(color-fg-header); font-size: 0.875rem; line-height: 1rem; } @@ -22,7 +22,7 @@ font-size: 0.75rem; line-height: 1rem; font-weight: 300; - color: nga-theme(color-fg-hint); + color: nga-theme(color-fg); } .btn-demo {