Skip to content

Refactor: header styling and reactmarkdown #1849

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

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Refactor: header styling and reactmarkdown #1849

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8c013c
refactor: header styling and reactmarkdown
alcercu Jan 27, 2025
b5a85e6
fix: use more adequate sizing for inner component
alcercu Jan 27, 2025
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
18 changes: 8 additions & 10 deletions web/src/pages/Courts/CourtDetails/Description.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,30 @@ const Container = styled.div`
const TextContainer = styled.div`
width: 100%;
padding: 12px 0;
`;

const StyledReactMarkdown = styled(ReactMarkdown)`
p {
word-break: break-word;
}

li {
line-height: 1.5em;
margin-top: 0.5em;
ul,
ol {
li + li {
margin-top: 8px;
}
}

h1 {
margin: 16px 0 16px 0;
font-size: 24px;
line-height: 32px;
}

h2 {
margin: 16px 0 16px 0;
font-size: 20px;
line-height: 24px;
}

h3 {
margin: 16px 0 16px 0;
font-size: 18px;
line-height: 20px;
}

a {
Expand Down Expand Up @@ -128,6 +126,6 @@ const Description: React.FC = () => {
};

const formatMarkdown = (markdown?: string) =>
markdown ? <ReactMarkdown>{markdown.replace(/\n/g, " \n")}</ReactMarkdown> : <StyledSkeleton />;
markdown ? <StyledReactMarkdown>{markdown.replace(/\n/g, " \n")}</StyledReactMarkdown> : <StyledSkeleton />;

export default Description;
10 changes: 6 additions & 4 deletions web/src/styles/global-style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const GlobalStyle = createGlobalStyle`

h2 {
margin: 0 0 16px 0;
font-weight: 600;
font-weight: 400;
font-size: 24px;
line-height: 32px;
color: ${({ theme }) => theme.primaryText};
Expand Down Expand Up @@ -93,7 +93,7 @@ export const GlobalStyle = createGlobalStyle`
color: ${({ theme }) => theme.primaryBlue};
transition: color 0.1s;
}

hr {
opacity: 1;
border: 1px solid ${({ theme }) => theme.stroke};
Expand All @@ -102,12 +102,14 @@ export const GlobalStyle = createGlobalStyle`
svg, img {
display: inline-block;
vertical-align: middle;
visibility: visible;

visibility: visible;
}

ul, ol {
li {
font-weight: 400;
font-size: 16px;
line-height: 24px;
color: ${({ theme }) => theme.primaryText};
}
}
Expand Down
Loading