From 5f1aba9a37e5c6d0ee6701c1fd312922c64ef4b4 Mon Sep 17 00:00:00 2001 From: Jesse Lucas Date: Thu, 9 Apr 2020 11:53:41 -0400 Subject: [PATCH] adjusting styles --- src/app/card/card.component.scss | 1 + src/app/dashboard/dashboard.component.scss | 3 +- .../status-list/status-list.component.html | 2 +- .../status-list/status-list.component.scss | 6 +--- src/styles.scss | 35 +++++++++++-------- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/app/card/card.component.scss b/src/app/card/card.component.scss index b682b30a0..3e0fae75b 100644 --- a/src/app/card/card.component.scss +++ b/src/app/card/card.component.scss @@ -17,6 +17,7 @@ .tui-card-title { padding: 16px 16px 0 16px; font-size: mat-font-size($tech-ui-typography, subheading-2); + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; color: mat-color($primary); } diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index d3181c868..ddeec0bd2 100644 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -1,5 +1,6 @@ .header { - margin: 20px 3vw 20px 3vw; + margin: 15px 3vw 12px 3vw; + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } .progress { diff --git a/src/app/lists/status-list/status-list.component.html b/src/app/lists/status-list/status-list.component.html index e98effdd1..bf2b5999d 100644 --- a/src/app/lists/status-list/status-list.component.html +++ b/src/app/lists/status-list/status-list.component.html @@ -1,4 +1,4 @@ - +
{{title | uppercase}} diff --git a/src/app/lists/status-list/status-list.component.scss b/src/app/lists/status-list/status-list.component.scss index 213f72723..e258cb9be 100644 --- a/src/app/lists/status-list/status-list.component.scss +++ b/src/app/lists/status-list/status-list.component.scss @@ -1,7 +1,3 @@ -.tui-card-toggle { +.status-list .tui-card-toggle { padding: 16px 16px 0 16px; -} - -.tui-card-content { - padding-top: 0; } \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 9e5344ac9..757f02480 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -78,24 +78,25 @@ $tech-ui-dark-theme: mat-dark-theme($tech-ui-primary, $tech-ui-accent, $tech-ui- // Include theme styles for core and each component used in your app. // Alternatively, you can import and @include the theme mixins for each component // that you are using. - @include angular-material-theme($tech-ui-theme); - @include tui-card-theme($tech-ui-theme); - @include chart-item-theme($tech-ui-theme); +@include angular-material-theme($tech-ui-theme); +@include tui-card-theme($tech-ui-theme); +@include chart-item-theme($tech-ui-theme); - html, body { - height: 100%; - background-color: #eeeeee; - font-size: mat-font-size($tech-ui-typography, body-1); - font-family: mat-font-family($tech-ui-typography); - line-height: mat-line-height($tech-ui-typography, body-1); - color: #303030; - } +html, body { + height: 100%; + background-color: #eeeeee; + font-size: mat-font-size($tech-ui-typography, body-1); + font-family: mat-font-family($tech-ui-typography); + line-height: mat-line-height($tech-ui-typography, body-1); + color: #303030; +} + +a { + text-decoration: underline; + color: #303030; +} - a { - text-decoration: underline; - color: #303030; - } @media (prefers-color-scheme: dark) { @include angular-material-theme($tech-ui-dark-theme); @include tui-card-theme($tech-ui-dark-theme); @@ -111,6 +112,10 @@ $tech-ui-dark-theme: mat-dark-theme($tech-ui-primary, $tech-ui-accent, $tech-ui- } } +.status-list .tui-card .tui-card-content { + padding-top: 0; +} + // Chart.js styles #chartjs-tooltip { /* max z-index value */