Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #1626

Merged
merged 7 commits into from
Oct 15, 2024
Merged

Dev #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0eeeee
reverted changes to linkastext component
hasham-qaiser Oct 5, 2024
9e8d0d2
added css styling to FAQaccordion component for all text
hasham-qaiser Oct 7, 2024
047aa46
simplified code
hasham-qaiser Oct 7, 2024
3653d5c
lint error
hasham-qaiser Oct 7, 2024
fa7dce8
adjusted changes recommended from dev lead for more consistentcy
hasham-qaiser Oct 8, 2024
e922b61
removed code that was left over
hasham-qaiser Oct 9, 2024
86ab68f
Merge pull request #1595 from hackforla/1434-link-color
sydneywalcoff Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions products/statement-generator/src/components/FAQAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ const useStyles = makeStyles(({ palette }) =>
color: palette.primary.darker,
boxShadow: 'none',
border: 'none',
position: 'static', // when position is 'relative' or not specified a vertical line appears above the accordion (unclear why)
position: 'static',
'& a': {
color: palette.primary.darker,
},
},
accordionSummary: {
fontSize: '20px',
lineHeight: '24px',
color: palette.primary.darker,
},
expandIcon: {
marginLeft: '0',
Expand Down
20 changes: 4 additions & 16 deletions products/statement-generator/src/components/LinkAsText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
import React from 'react';
import { makeStyles, createStyles, Link } from '@material-ui/core';

const useStyles = makeStyles(() =>
const useStyles = makeStyles(({ palette }) =>
createStyles({
linkAsText: {
color: '#25003F',
'&:visited': {
color: '#25003F', // Same color for visited links
},
'&:hover': {
color: '#25003F', // Same color on hover
},
color: palette.common.black,
},
})
);

interface LinkAsTextProps {
link: string;
label?: string;
}

export default function LinkAsText({ link, label }: LinkAsTextProps) {
export default function LinkAsText({ link }: any) {
const classes = useStyles();
return (
<>
Expand All @@ -30,9 +19,8 @@ export default function LinkAsText({ link, label }: LinkAsTextProps) {
className={classes.linkAsText}
href={link}
target="_blank"
rel="noopener noreferrer"
>
{label || link}
{link}
</Link>
&nbsp;
</>
Expand Down