diff --git a/src/_sass/_base.scss b/src/_sass/_base.scss index 118ecff6..50f79272 100644 --- a/src/_sass/_base.scss +++ b/src/_sass/_base.scss @@ -15,7 +15,7 @@ a:focus { } blockquote { - background-color: $gray-light; + background-color: var(--gray-light); border-radius: $border-radius-lg; border-width: 0; padding: 2rem; @@ -40,7 +40,7 @@ blockquote { figure { background: none; border: none; - margin-bottom: map-get($spacers, 3); + margin-bottom: 1rem; figcaption { font-style: italic; @@ -71,7 +71,7 @@ h5 { h1, h2, h3 { - font-family: $headings-font-family; + font-family: var(--headings-font-family); } h4, @@ -122,20 +122,20 @@ h5, } .subtext { - color: $primary; + color: var(--bs-primary); font-size: calc(14rem / 16); font-weight: 500; } hr { - margin-bottom: map-get($spacers, 4); - margin-top: map-get($spacers, 4); + margin-bottom: 1.5rem; + margin-top: 1.5rem; width: 100%; } .youtube { height: 315px; - margin-bottom: map-get($spacers, 3); + margin-bottom: 1rem; margin-left: auto; margin-right: auto; width: 100%; diff --git a/src/_sass/_utilities.scss b/src/_sass/_utilities.scss index ec561f17..954c8872 100644 --- a/src/_sass/_utilities.scss +++ b/src/_sass/_utilities.scss @@ -2,27 +2,23 @@ $mm-dark-tan: rgb(246, 243, 237); .bg-blue-lightest { - background-color: $blue-lightest; + background-color: var(--cal-itp-background-blue); } .bg-dark-tan { background-color: $mm-dark-tan; } -.bg-gray-light { - background-color: $gray-light; -} - .bg-gray-lightest { background-color: $gray-lightest; } .bg-dark-blue { - background-color: $dark-blue; + background-color: var(--cal-itp-dark-blue); } .bg-blue-lightest { - background-color: $blue-lightest; + background-color: var(--cal-itp-background-blue); } // Text @@ -55,10 +51,10 @@ $mm-dark-tan: rgb(246, 243, 237); .btn.btn-dark-blue-inverted { background-color: #ffffff; - color: $dark-blue; + color: var(--cal-itp-dark-blue); &:hover { background-color: $gray-1; - color: $dark-blue; + color: var(--cal-itp-dark-blue); } } @@ -110,12 +106,12 @@ $mm-dark-tan: rgb(246, 243, 237); // Tables .table-dark-blue { - background-color: $dark-blue !important; + background-color: var(--cal-itp-dark-blue) !important; box-shadow: none !important; } .border-dark-blue { - border-color: $dark-blue !important; + border-color: var(--cal-itp-dark-blue) !important; } .table-sticky-column { diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss index 6ffff9ff..040486f5 100644 --- a/src/_sass/_variables.scss +++ b/src/_sass/_variables.scss @@ -1,23 +1,15 @@ // Variables -$headings-font-family: "Raleway", sans-serif; $text-color: #323a45; $headings-color: $text-color; -$code-color: $text-color; // Colors -$blue-lightest: #f5f9fb; -$gray-light: #d1dee3; $gray-lightest: #f3f3f4; $hover-color: #035376; // New colors from 2023 / Figma -$primary: #046b99; -$primary-black: #212121; -$dark-blue: #225173; - $gray-1: #eeeeee; $gray-3: #8f9399; $gray-4: #60656b; @@ -30,7 +22,7 @@ $focus: #99b5fa; $backgroundColor: #fff; $headerBackgroundColor: $backgroundColor; $rowBorderColor: #cccccc; -$rowHoverBackground: $blue-lightest; +$rowHoverBackground: #f5f9fb; $table-border-color: $rowBorderColor; // Down arrow icon used in selects and table sorts @@ -41,30 +33,41 @@ $custom-select-indicator: url('data:image/svg+xml, li > ul { li a { - color: $primary; + color: var(--bs-primary); white-space: break-spaces; } } @@ -161,7 +161,7 @@ display: inline-block; padding-bottom: 12px; padding-top: 12px; - width: 100% + width: 100%; } ul .dropdown-item { diff --git a/src/_sass/overrides/_buttons.scss b/src/_sass/overrides/_buttons.scss index 941c2491..e525a89f 100644 --- a/src/_sass/overrides/_buttons.scss +++ b/src/_sass/overrides/_buttons.scss @@ -1,21 +1,12 @@ .btn { border-radius: calc(5rem / 16); font-weight: bold; - padding: 0.4375rem 0.75rem; // Button height of 40px + padding: 0.4375rem 0.75rem; width: 100%; border-width: 2px; - @include media-breakpoint-up(md) { - width: initial; - } } - -.btn-outline-primary { - background-color: transparent !important; - - &:hover, - &:active, - &:focus { - color: $hover-color; - border-color: $hover-color; +@media (min-width: breakpoint-min(md, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1400px))) { + .btn { + width: initial; } } diff --git a/src/_sass/overrides/_main-content.scss b/src/_sass/overrides/_main-content.scss index ad1f19c5..2a81de4f 100644 --- a/src/_sass/overrides/_main-content.scss +++ b/src/_sass/overrides/_main-content.scss @@ -1,15 +1,11 @@ -.main-content a { - &:not(.btn) { - font-weight: bold; - - &, - &:hover { - background: 0; - } - } - - &.no-default-style { - border-bottom: 0; - font-weight: normal; - } +.main-content a:not(.btn) { + font-weight: bold; +} +.main-content a:not(.btn), +.main-content a:not(.btn):hover { + background: 0; +} +.main-content a.no-default-style { + border-bottom: 0; + font-weight: normal; } diff --git a/src/_sass/pages/_contracts.scss b/src/_sass/pages/_contracts.scss index 45bfad40..df643952 100644 --- a/src/_sass/pages/_contracts.scss +++ b/src/_sass/pages/_contracts.scss @@ -1,9 +1,9 @@ .contactless-technology { - background-color: rgba(#EBF8FC, 50%); + background-color: rgba(#ebf8fc, 50%); border-radius: $border-radius-lg; display: flex; - margin-bottom: map-get($spacers, 4); - padding: map-get($spacers, 4); + margin-bottom: 1.5rem; + padding: 1.5rem; &:last-child { margin-bottom: 0; @@ -11,12 +11,12 @@ } .contactless-technology__icon { - margin-right: map-get($spacers, 4); + margin-right: 1.5rem; } .contactless-technology__header { margin: 0; - margin-bottom: map-get($spacers, 2); + margin-bottom: 0.5rem; } .contactless-technology__subheader { diff --git a/src/_sass/pages/_go-contactless.scss b/src/_sass/pages/_go-contactless.scss index 5b1fca7e..cd74b9c5 100644 --- a/src/_sass/pages/_go-contactless.scss +++ b/src/_sass/pages/_go-contactless.scss @@ -114,8 +114,8 @@ ol.timeline { font-weight: 600; float: left; width: calc(48rem / 16); - color: $primary; - border: calc(4rem / 16) solid $primary; + color: var(--bs-primary); + border: calc(4rem / 16) solid var(--bs-primary); border-radius: 50%; height: calc(48rem / 16); font-size: calc(24rem / 16); @@ -130,7 +130,7 @@ ol.timeline { .timeline-item { margin-left: calc(24rem / 16); padding-left: calc(36rem / 16); - border-left: 4px solid $primary; + border-left: 4px solid var(--bs-primary); padding-bottom: calc(50rem / 16); } li:last-of-type .timeline-item {