From adb1abf54e8ea63b19a41a5b7d5b1bc1d4684697 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Fri, 13 Oct 2023 10:13:06 -0700 Subject: [PATCH 1/4] fix: wip global change --- doorway-ui-components/src/global/text.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doorway-ui-components/src/global/text.scss b/doorway-ui-components/src/global/text.scss index fc86f580d9..0c5ea1cc0a 100644 --- a/doorway-ui-components/src/global/text.scss +++ b/doorway-ui-components/src/global/text.scss @@ -44,10 +44,11 @@ h6 { } a { - @apply text-primary; + @apply text-primary-lighter; + @apply underline; &:hover { - @apply text-primary-darker; + @apply text-primary-light; } &:focus { @@ -55,10 +56,6 @@ a { box-shadow: 0 0 3px 4px $tailwind-accent-cool; } - &.lined { - @apply underline; - } - &.alert { @apply text-alert; } From 54a6d4d2781f9512d74ef33e046450ae29cd88b2 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 24 Oct 2023 12:44:05 -0700 Subject: [PATCH 2/4] fix: update underlining --- doorway-ui-components/src/global/text.scss | 9 ++++++--- .../help-center/DoorwayLinkableCardGroup.scss | 11 +++++++++-- .../src/components/listings/search/LandingSearch.tsx | 2 +- .../listings/search/ListingsSearchModal.tsx | 2 +- sites/public/src/pages/index.tsx | 1 + 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doorway-ui-components/src/global/text.scss b/doorway-ui-components/src/global/text.scss index 0c5ea1cc0a..fc86f580d9 100644 --- a/doorway-ui-components/src/global/text.scss +++ b/doorway-ui-components/src/global/text.scss @@ -44,11 +44,10 @@ h6 { } a { - @apply text-primary-lighter; - @apply underline; + @apply text-primary; &:hover { - @apply text-primary-light; + @apply text-primary-darker; } &:focus { @@ -56,6 +55,10 @@ a { box-shadow: 0 0 3px 4px $tailwind-accent-cool; } + &.lined { + @apply underline; + } + &.alert { @apply text-alert; } diff --git a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss index b5997c1848..d2a7b65cca 100644 --- a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss +++ b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss @@ -16,6 +16,13 @@ } } -.doorway-linkable-card-group-main { - flex: 1; +.doorway-linkable-card-group_main { + a { + text-decoration: underline; + color: var(--bloom-color-primary-lighter); + + &:hover { + color: var(--bloom-color-primary-light); + } + } } diff --git a/sites/public/src/components/listings/search/LandingSearch.tsx b/sites/public/src/components/listings/search/LandingSearch.tsx index 2d6a86f0f3..3ed8807bee 100644 --- a/sites/public/src/components/listings/search/LandingSearch.tsx +++ b/sites/public/src/components/listings/search/LandingSearch.tsx @@ -91,7 +91,7 @@ export function LandingSearch(props: LandingSearchProps) { let check = false const dahliaNote = `(${t( "filter.goToDahlia" - )} DAHLIA)` + )} DAHLIA)` counties.forEach((county, idx) => { // FieldGroup uses the label attribute to check for selected inputs. diff --git a/sites/public/src/components/listings/search/ListingsSearchModal.tsx b/sites/public/src/components/listings/search/ListingsSearchModal.tsx index 26bcd445b1..607b260cea 100644 --- a/sites/public/src/components/listings/search/ListingsSearchModal.tsx +++ b/sites/public/src/components/listings/search/ListingsSearchModal.tsx @@ -181,7 +181,7 @@ export function ListingsSearchModal(props: ListingsSearchModalProps) { let check = false const dahliaNote = `(${t( "filter.goToDahlia" - )} DAHLIA)` + )} DAHLIA)` counties.forEach((county, idx) => { // FieldGroup uses the label attribute to check for selected inputs. check = selected[county.label] !== undefined diff --git a/sites/public/src/pages/index.tsx b/sites/public/src/pages/index.tsx index 2f9dec6d78..926dce6278 100644 --- a/sites/public/src/pages/index.tsx +++ b/sites/public/src/pages/index.tsx @@ -84,6 +84,7 @@ export default function Home(props: IndexProps) { {t("welcome.useDoorwayBAHFAtext")}
From 9010c5367e4432ec07ca8504341d89fec3e954a4 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 24 Oct 2023 17:17:36 -0700 Subject: [PATCH 3/4] fix: broader underlining --- .../help-center/DoorwayLinkableCardGroup.scss | 19 ++++++++----------- .../help-center/DoorwayLinkableCardGroup.tsx | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss index d2a7b65cca..e279cb19df 100644 --- a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss +++ b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.scss @@ -5,6 +5,14 @@ @media (max-width: $screen-lg) { flex-direction: column; } + a { + text-decoration: underline; + color: var(--bloom-color-primary-lighter); + + &:hover { + color: var(--bloom-color-primary-light); + } + } } .doorway-linkable-card-group_nav { @@ -15,14 +23,3 @@ padding: var(--doorway-standard-spacing); } } - -.doorway-linkable-card-group_main { - a { - text-decoration: underline; - color: var(--bloom-color-primary-lighter); - - &:hover { - color: var(--bloom-color-primary-light); - } - } -} diff --git a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.tsx b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.tsx index fbb05976d7..f137873ca9 100644 --- a/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.tsx +++ b/doorway-ui-components/src/page_components/help-center/DoorwayLinkableCardGroup.tsx @@ -34,7 +34,7 @@ const DoorwayLinkableCardGroup = (props: DoorwayLinkableCardGroupProps) => {
{getLinks()}
-
+
{props.children} {props.cards}
From 46ccbf083e97b241a4238191d35d473d28da509b Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 25 Oct 2023 14:42:17 -0700 Subject: [PATCH 4/4] fix: underline filter Dahlia --- .../src/components/listings/search/ListingsSearchModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/public/src/components/listings/search/ListingsSearchModal.tsx b/sites/public/src/components/listings/search/ListingsSearchModal.tsx index 607b260cea..9b408dd207 100644 --- a/sites/public/src/components/listings/search/ListingsSearchModal.tsx +++ b/sites/public/src/components/listings/search/ListingsSearchModal.tsx @@ -181,7 +181,7 @@ export function ListingsSearchModal(props: ListingsSearchModalProps) { let check = false const dahliaNote = `(${t( "filter.goToDahlia" - )} DAHLIA)` + )} DAHLIA)` counties.forEach((county, idx) => { // FieldGroup uses the label attribute to check for selected inputs. check = selected[county.label] !== undefined