diff --git a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss index 848804ab..5d77c58a 100644 --- a/client/src/components/DisadvantageDot/DisadvantageDot.module.scss +++ b/client/src/components/DisadvantageDot/DisadvantageDot.module.scss @@ -1,4 +1,5 @@ @use '../../styles/design-system.scss' as *; +@import "../utils.scss"; .disadvantagedDotSmall { @include u-circle('105'); @@ -12,7 +13,7 @@ @include u-circle(4); margin: 2.3rem 1.5rem 2rem 0; // opacity: .6; - border: 3px solid #1A4480; + border: 3px solid $disadvantagedDotColor; //Maintain aspect ratio as screen width decreases flex: 1 0 2rem; diff --git a/client/src/components/Indicator/Indicator.module.scss b/client/src/components/Indicator/Indicator.module.scss index 6d9ef09b..1bd84e8b 100644 --- a/client/src/components/Indicator/Indicator.module.scss +++ b/client/src/components/Indicator/Indicator.module.scss @@ -1,6 +1,11 @@ @use '../../styles/design-system.scss' as *; @import "../utils.scss"; +@mixin indicatorPadding { + @include u-padding-left(1); + @include u-padding-right(1); +} + @mixin indicator { display: flex; flex-direction: column; @@ -46,8 +51,14 @@ align-self: end; .indicatorValue { - margin-left: 2.2rem; - } + @include indicatorPadding(); + } + + .disIndicatorValue { + @include indicatorPadding(); + color: white; + background-color: $disadvantagedDotColor; + } .indicatorArrow { margin-bottom: -.375rem; @@ -82,30 +93,3 @@ .indicatorBoxMain { @include indicator; } - -.disadvantagedIndicator { - @include indicator; - @include u-bg('blue-warm-10'); - - // A darker bg color: - // background-color: #D2DAE3; - - // Add a border - // border: 1px solid #1A4480; - - margin: 0 -20px 1px -20px; - @include u-padding-left(2.5); - @include u-padding-right(2.5); - - - // Overwrite indicator mixin with bolder fonts for disadv. indicator - .indicatorRow { - .indicatorName { - @include u-text('bold'); - - .indicatorDesc { - @include u-text('normal'); - } - } - } -} \ No newline at end of file diff --git a/client/src/components/Indicator/Indicator.module.scss.d.ts b/client/src/components/Indicator/Indicator.module.scss.d.ts index 6d10859d..9a8e43f2 100644 --- a/client/src/components/Indicator/Indicator.module.scss.d.ts +++ b/client/src/components/Indicator/Indicator.module.scss.d.ts @@ -7,6 +7,7 @@ declare namespace IndicatorNamespace { indicatorValueCol:string; indicatorValueRow:string; indicatorValue:string; + disIndicatorValue:string; indicatorSuperscript:string; indicatorArrow:string; unavailable:string; diff --git a/client/src/components/Indicator/Indicator.tsx b/client/src/components/Indicator/Indicator.tsx index ff1c774a..d3729c03 100644 --- a/client/src/components/Indicator/Indicator.tsx +++ b/client/src/components/Indicator/Indicator.tsx @@ -212,7 +212,7 @@ const Indicator = ({indicator}:IIndicator) => { return (