From e82a6c8260c58676e00c0d4e1fbd8bb0f3cf43b0 Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Thu, 30 Nov 2023 16:08:20 -0500 Subject: [PATCH 1/7] Add common styles files and update ArrowLink --- overrides/common/styles.ts | 15 +++++++++++++++ overrides/home/arrow-link.tsx | 11 +++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 overrides/common/styles.ts diff --git a/overrides/common/styles.ts b/overrides/common/styles.ts new file mode 100644 index 000000000..2d995220f --- /dev/null +++ b/overrides/common/styles.ts @@ -0,0 +1,15 @@ +import { NavLink } from "$veda-ui/react-router-dom"; +import styled from "$veda-ui/styled-components"; + +export const AccessibilityLink = styled(NavLink)` + text-decoration: underline; + &:hover { + cursor: pointer; + } + &:focus { + outline: 3px solid #1565EF; + } + &:active { + color: black; + } +`; \ No newline at end of file diff --git a/overrides/home/arrow-link.tsx b/overrides/home/arrow-link.tsx index 5a197390d..d082b289c 100644 --- a/overrides/home/arrow-link.tsx +++ b/overrides/home/arrow-link.tsx @@ -1,21 +1,16 @@ import React from "$veda-ui/react"; -import { NavLink } from "$veda-ui/react-router-dom"; import styled from "$veda-ui/styled-components"; import { glsp, themeVal } from "$veda-ui/@devseed-ui/theme-provider"; import { CollecticonArrowRight } from "$veda-ui/@devseed-ui/collecticons"; +import { AccessibilityLink } from "../common/styles"; -const ArrowLinkCmp = styled(NavLink)` +const ArrowLinkCmp = styled(AccessibilityLink)` display: flex; align-items: center; gap: ${glsp(0.5)}; color: ${themeVal("color.link")}; - text-decoration: none; pointer-events: all; - - &:hover, - &:focus { - text-decoration: underline; - } + width: fit-content; `; export function ArrowLink(props) { From 5bdfc597d7a856cf6dfac3eb9bf5a18a64eb4235 Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Fri, 1 Dec 2023 13:04:18 -0500 Subject: [PATCH 2/7] Creating new button styles --- overrides/common/styles.ts | 25 +++++++++++++++++-- .../components/page-footer/component.tsx | 11 ++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/overrides/common/styles.ts b/overrides/common/styles.ts index 2d995220f..f43bea0dc 100644 --- a/overrides/common/styles.ts +++ b/overrides/common/styles.ts @@ -1,4 +1,4 @@ -import { NavLink } from "$veda-ui/react-router-dom"; +import { Link, NavLink } from "$veda-ui/react-router-dom"; import styled from "$veda-ui/styled-components"; export const AccessibilityLink = styled(NavLink)` @@ -12,4 +12,25 @@ export const AccessibilityLink = styled(NavLink)` &:active { color: black; } -`; \ No newline at end of file +`; + +export const AccessibilityMenuItem = styled(NavLink)` + text-decoration: none; + &:hover { + cursor: pointer; + text-decoration: underline; + } + &:focus { + outline: 3px solid #1565EF; + } + &:active { + color: black; + text-decoration: underline; + } +`; + +export const AccessibilityExternalLinkButton = styled.a` +` + +export const AccessibilityInternalLinkButton = styled(Link)` +` \ No newline at end of file diff --git a/overrides/components/page-footer/component.tsx b/overrides/components/page-footer/component.tsx index 6f5bb6d74..c3f1766ae 100644 --- a/overrides/components/page-footer/component.tsx +++ b/overrides/components/page-footer/component.tsx @@ -25,6 +25,7 @@ import { import { useFeedbackModal } from "$veda-ui-scripts/components/common/layout-root"; import { useMediaQuery } from "$veda-ui-scripts/utils/use-media-query"; import Partners from "../../home/partners"; +import { AccessibilityMenuItem } from "../../common/styles"; const FooterInner = styled.div` display: flex; @@ -58,15 +59,15 @@ const FooterMenu = styled.ul` } `; -const FooterMenuLink = styled(NavLink)` +const FooterMenuLink = styled(AccessibilityMenuItem)` font-weight: ${themeVal("type.base.regular")}; - text-decoration: none; + // text-decoration: none; font-size: 0.875rem; text-transform: ${themeVal("button.type.case")}; - &:hover { - text-decoration: underline; - } + // &:hover { + // text-decoration: underline; + // } `; const FooterContacts = styled.div` From a08bdf3a5a87489dee48fae5ce1244dbe85cefc0 Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Thu, 14 Dec 2023 11:51:20 -0500 Subject: [PATCH 3/7] remove commented out comments --- overrides/components/page-footer/component.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/overrides/components/page-footer/component.tsx b/overrides/components/page-footer/component.tsx index c3f1766ae..cd3a84fb8 100644 --- a/overrides/components/page-footer/component.tsx +++ b/overrides/components/page-footer/component.tsx @@ -61,13 +61,8 @@ const FooterMenu = styled.ul` const FooterMenuLink = styled(AccessibilityMenuItem)` font-weight: ${themeVal("type.base.regular")}; - // text-decoration: none; font-size: 0.875rem; text-transform: ${themeVal("button.type.case")}; - - // &:hover { - // text-decoration: underline; - // } `; const FooterContacts = styled.div` From 7455d529ad78c1d4feba47b75dce8c391c85406c Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Thu, 14 Dec 2023 11:55:40 -0500 Subject: [PATCH 4/7] remove unused style vars --- overrides/common/styles.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/overrides/common/styles.ts b/overrides/common/styles.ts index f43bea0dc..699b2138f 100644 --- a/overrides/common/styles.ts +++ b/overrides/common/styles.ts @@ -27,10 +27,4 @@ export const AccessibilityMenuItem = styled(NavLink)` color: black; text-decoration: underline; } -`; - -export const AccessibilityExternalLinkButton = styled.a` -` - -export const AccessibilityInternalLinkButton = styled(Link)` -` \ No newline at end of file +`; \ No newline at end of file From e8ae3b1694cafd1dc968386542f81e8e2b06d29f Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Mon, 18 Dec 2023 16:57:10 -0500 Subject: [PATCH 5/7] Update button font-weight --- veda.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veda.config.js b/veda.config.js index 052a00c6a..7bfae82a4 100644 --- a/veda.config.js +++ b/veda.config.js @@ -56,7 +56,7 @@ module.exports = { button: { type: { case: "uppercase", - weight: 400, + weight: 550, }, }, }, From e5911fc24e154a57caafbdcdf37062dafa54958c Mon Sep 17 00:00:00 2001 From: Siddharth Chaudhary <118487103+siddharth0248@users.noreply.github.com> Date: Wed, 20 Dec 2023 16:10:49 -0600 Subject: [PATCH 6/7] Fix broken link for EPA Broken link for the image in EPA data insight was fixed --- stories/us-methane-sources.stories.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stories/us-methane-sources.stories.mdx b/stories/us-methane-sources.stories.mdx index aa048335b..45c58a54b 100644 --- a/stories/us-methane-sources.stories.mdx +++ b/stories/us-methane-sources.stories.mdx @@ -53,8 +53,8 @@ taxonomy: src={new URL('./gas-flaring.png', import.meta.url).href} alt="colorful gas flare from chimney against blue sky" align="left" - attrAuthor="Leslie Von Pless" - attrUrl="https://www.nasa.gov/sites/default/files/thumbnails/image/1-permian-methane-von-pless-gas-flaring-photo-hi-rez-1041.jpg" + attrAuthor="Leslie Von Pless/Environmental Defense Fund (EDF)" + attrUrl="https://d2pn8kiwq2w21t.cloudfront.net/images/1-Permian-methane-Von-Pless-gas-flaring-photo.width-1320.jpg" /> Gas flaring during oil and gas production is a known source of methane emissions From 66c40b8329fd9661f736fd616a96791200fa2900 Mon Sep 17 00:00:00 2001 From: Sandra Hoang Date: Tue, 2 Jan 2024 09:51:01 -0500 Subject: [PATCH 7/7] Update to pr comments --- overrides/common/styles.ts | 18 +++++++++--------- veda.config.js | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/overrides/common/styles.ts b/overrides/common/styles.ts index 699b2138f..0b9ba0365 100644 --- a/overrides/common/styles.ts +++ b/overrides/common/styles.ts @@ -1,8 +1,7 @@ -import { Link, NavLink } from "$veda-ui/react-router-dom"; -import styled from "$veda-ui/styled-components"; +import { NavLink } from "$veda-ui/react-router-dom"; +import styled, { css } from "$veda-ui/styled-components"; -export const AccessibilityLink = styled(NavLink)` - text-decoration: underline; +const MouseEventStyle = css` &:hover { cursor: pointer; } @@ -12,19 +11,20 @@ export const AccessibilityLink = styled(NavLink)` &:active { color: black; } +` + +export const AccessibilityLink = styled(NavLink)` + text-decoration: underline; + ${MouseEventStyle} `; export const AccessibilityMenuItem = styled(NavLink)` text-decoration: none; + ${MouseEventStyle} &:hover { - cursor: pointer; text-decoration: underline; } - &:focus { - outline: 3px solid #1565EF; - } &:active { - color: black; text-decoration: underline; } `; \ No newline at end of file diff --git a/veda.config.js b/veda.config.js index 7bfae82a4..dc9701259 100644 --- a/veda.config.js +++ b/veda.config.js @@ -56,7 +56,7 @@ module.exports = { button: { type: { case: "uppercase", - weight: 550, + weight: 500, }, }, },