mirror of
https://github.com/DOI-DO/j40-cejst-2.git
synced 2025-02-23 10:04:18 -08:00
update styling for indicator values
- refactor disadvantaged blue dot to utils.scss
This commit is contained in:
parent
b0b2bc387b
commit
a49dbfdf90
5 changed files with 25 additions and 37 deletions
|
@ -1,4 +1,5 @@
|
||||||
@use '../../styles/design-system.scss' as *;
|
@use '../../styles/design-system.scss' as *;
|
||||||
|
@import "../utils.scss";
|
||||||
|
|
||||||
.disadvantagedDotSmall {
|
.disadvantagedDotSmall {
|
||||||
@include u-circle('105');
|
@include u-circle('105');
|
||||||
|
@ -12,7 +13,7 @@
|
||||||
@include u-circle(4);
|
@include u-circle(4);
|
||||||
margin: 2.3rem 1.5rem 2rem 0;
|
margin: 2.3rem 1.5rem 2rem 0;
|
||||||
// opacity: .6;
|
// opacity: .6;
|
||||||
border: 3px solid #1A4480;
|
border: 3px solid $disadvantagedDotColor;
|
||||||
|
|
||||||
//Maintain aspect ratio as screen width decreases
|
//Maintain aspect ratio as screen width decreases
|
||||||
flex: 1 0 2rem;
|
flex: 1 0 2rem;
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
@use '../../styles/design-system.scss' as *;
|
@use '../../styles/design-system.scss' as *;
|
||||||
@import "../utils.scss";
|
@import "../utils.scss";
|
||||||
|
|
||||||
|
@mixin indicatorPadding {
|
||||||
|
@include u-padding-left(1);
|
||||||
|
@include u-padding-right(1);
|
||||||
|
}
|
||||||
|
|
||||||
@mixin indicator {
|
@mixin indicator {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
@ -46,7 +51,13 @@
|
||||||
align-self: end;
|
align-self: end;
|
||||||
|
|
||||||
.indicatorValue {
|
.indicatorValue {
|
||||||
margin-left: 2.2rem;
|
@include indicatorPadding();
|
||||||
|
}
|
||||||
|
|
||||||
|
.disIndicatorValue {
|
||||||
|
@include indicatorPadding();
|
||||||
|
color: white;
|
||||||
|
background-color: $disadvantagedDotColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
.indicatorArrow {
|
.indicatorArrow {
|
||||||
|
@ -82,30 +93,3 @@
|
||||||
.indicatorBoxMain {
|
.indicatorBoxMain {
|
||||||
@include indicator;
|
@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');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -7,6 +7,7 @@ declare namespace IndicatorNamespace {
|
||||||
indicatorValueCol:string;
|
indicatorValueCol:string;
|
||||||
indicatorValueRow:string;
|
indicatorValueRow:string;
|
||||||
indicatorValue:string;
|
indicatorValue:string;
|
||||||
|
disIndicatorValue:string;
|
||||||
indicatorSuperscript:string;
|
indicatorSuperscript:string;
|
||||||
indicatorArrow:string;
|
indicatorArrow:string;
|
||||||
unavailable:string;
|
unavailable:string;
|
||||||
|
|
|
@ -212,7 +212,7 @@ const Indicator = ({indicator}:IIndicator) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<li
|
<li
|
||||||
className={indicator.isDisadvagtaged ? styles.disadvantagedIndicator : styles.indicatorBoxMain}
|
className={styles.indicatorBoxMain}
|
||||||
data-cy={'indicatorBox'}
|
data-cy={'indicatorBox'}
|
||||||
data-testid='indicator-box'>
|
data-testid='indicator-box'>
|
||||||
<div className={styles.indicatorRow}>
|
<div className={styles.indicatorRow}>
|
||||||
|
@ -230,7 +230,9 @@ const Indicator = ({indicator}:IIndicator) => {
|
||||||
<div className={styles.indicatorValueRow}>
|
<div className={styles.indicatorValueRow}>
|
||||||
|
|
||||||
{/* Indicator value */}
|
{/* Indicator value */}
|
||||||
<div className={styles.indicatorValue}>
|
<div className={indicator.isDisadvagtaged ?
|
||||||
|
styles.disIndicatorValue : styles.indicatorValue}
|
||||||
|
>
|
||||||
<IndicatorValue
|
<IndicatorValue
|
||||||
type={indicator.type}
|
type={indicator.type}
|
||||||
displayStat={displayStat}
|
displayStat={displayStat}
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//Styles associated with the side panel
|
//Styles associated with the side panel
|
||||||
$sidePanelBorderColor: #f2f2f2;
|
$sidePanelBorderColor: #F2F2F2;
|
||||||
$sidePanelBorder: 2px solid $sidePanelBorderColor;
|
$sidePanelBorder: 2px solid $sidePanelBorderColor;
|
||||||
$mobileBreakpoint: 400px; // Todo replace with USWDS breakpoint
|
$mobileBreakpoint: 400px; // Todo replace with USWDS breakpoint
|
||||||
|
$disadvantagedDotColor: #1A4480;
|
||||||
$additionalCardsBGColor: #FAFAFA;
|
$additionalCardsBGColor: #FAFAFA;
|
||||||
$sidePanelLabelFontColor: #171716;
|
$sidePanelLabelFontColor: #171716;
|
||||||
|
|
||||||
|
@ -21,6 +21,6 @@ $sidePanelLabelFontColor: #171716;
|
||||||
|
|
||||||
|
|
||||||
//Styles with Dataset container
|
//Styles with Dataset container
|
||||||
$datasetContainerColor: #eef6fb;
|
$datasetContainerColor: #EEF6FB;
|
||||||
$headingFontColor: #122e51;
|
$headingFontColor: #122E51;
|
||||||
$j40AlertWarningColor: #faf3d1;
|
$j40AlertWarningColor: #FAF3D1;
|
||||||
|
|
Loading…
Add table
Reference in a new issue