Skip to content

Commit

Permalink
style: update lsd font and misc. styles
Browse files Browse the repository at this point in the history
  • Loading branch information
jinhojang6 committed Jun 15, 2024
1 parent 541a9b9 commit f235eac
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/components/Article/Article.Heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const ArticleHeading = ({

const Headline = styled(Typography)`
white-space: pre-wrap;
margin-top: 16px;
margin-top: 24px;
${(props) => lsdUtils.breakpoint(props.theme, 'xs', 'down')} {
&.title {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Article/Article.ImageBlockWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const ArticleImageBlockWrapper = ({ image, order }: Props) => {
}

const Container = styled.figure`
margin: 32px 0 32px 0;
margin: 40px 0 40px 0;
padding: 0;
display: flex;
flex-direction: column;
Expand Down
12 changes: 8 additions & 4 deletions src/components/Article/Header/Article.Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ const ArticleHeader = ({
{subtitle}
</ArticleSubtitle>
)}
<AuthorsContainer>
<Authors authors={authors} />
</AuthorsContainer>

<TagsAndSocial
tags={tags.map((tag) => tag.name)}
className={'articleTags'}
/>
<AuthorsContainer>
<Authors authors={authors} />
</AuthorsContainer>

{coverImage && (
<ArticleImageBlockWrapper
image={coverImage}
Expand All @@ -73,6 +75,8 @@ const ArticleHeader = ({
}

const ArticleHeaderContainer = styled.header`
margin-bottom: 24px;
.mobileSummary {
display: none;
}
Expand Down Expand Up @@ -123,7 +127,7 @@ const ArticleSubtitle = styled(CustomTypography)`

const AuthorsContainer = styled.div`
//margin-block: 24px;
margin-top: 24px;
margin-top: 16px;
margin-bottom: 32px;
${(props) => lsdUtils.breakpoint(props.theme, 'xs', 'down')} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Article/Header/Article.Summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const ArticleSummary = ({ summary, className, showLabel }: Props) => {
<ArticleSummaryContainer className={className}>
{showLabel && <Typography variant="body3">summary</Typography>}
<SummaryParagraph
variant="h6"
variant="h4"
component={'div'}
dangerouslySetInnerHTML={{
__html: removeDynamicSection(summary),
Expand Down
2 changes: 1 addition & 1 deletion src/components/JoinDiscordCard/JoinDiscordCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const JoinDiscordCard: FC<JoinDiscordCardProps> = ({
}) => {
return (
<JoinDiscordCardContainer {...props}>
<Typography variant="body1">Join the discussion</Typography>
<Typography variant="h3">Join the discussion</Typography>
<Link
href={discordHref}
style={{
Expand Down
4 changes: 3 additions & 1 deletion src/components/Podcasts/PodcastShowCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export default function PodcastShowCard({
height={show.logo.height}
/>
<ShowData>
<Title variant="h3">{show.title}</Title>
<Title variant="h2" genericFontFamily="serif">
{show.title}
</Title>
<PodcastHost show={show} />
<Description
variant="body2"
Expand Down
2 changes: 1 addition & 1 deletion src/components/PostCard/PostCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ PostCard.styles = {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
max-height: calc(3 * var(--lsd-h5-lineHeight));
max-height: calc(3 * var(--lsd-h4-lineHeight));
}
.post-card__subtitle {
Expand Down
13 changes: 8 additions & 5 deletions src/containers/HomePage/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export const HomePage: React.FC<HomePageProps> = ({

<PodcastShowsPreview data={{ shows }} />

<BrowseAll title="Browser all" size="large">
<BrowseAll title="Browse all" size="large">
<TagsTitle>
<Typography component="h2" variant="body1">
Tags
Expand Down Expand Up @@ -340,6 +340,11 @@ const FeaturedFirst = styled.div`
margin-top: var(--lsd-spacing-32) !important;
}
.post-card__title h3 {
font-size: var(--lsd-h2-fontSize) !important;
line-height: var(--lsd-h2-lineHeight) !important;
}
.post-card__subtitle {
margin-top: var(--lsd-spacing-16) !important;
}
Expand All @@ -354,9 +359,8 @@ const FeaturedSecond = styled.div`
}
.post-card__title-text {
font-size: var(--lsd-h5-fontSize) !important;
font-weight: var(--lsd-h5-fontWeight) !important;
line-height: var(--lsd-h5-lineHeight) !important;
font-size: var(--lsd-h4-fontSize) !important;
line-height: var(--lsd-h4-lineHeight) !important;
}
.post-card__label {
Expand All @@ -365,7 +369,6 @@ const FeaturedSecond = styled.div`
.post-card__label * {
font-size: var(--lsd-subtitle4-fontSize) !important;
font-weight: var(--lsd-subtitle4-fontWeight) !important;
line-height: var(--lsd-subtitle4-lineHeight) !important;
}
Expand Down
4 changes: 2 additions & 2 deletions src/containers/PodcastShowsPreview/PodcastShowsPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ const Root = styled('div')`
${(props) => lsdUtils.breakpoint(props.theme, 'xs', 'down')} {
.post-card__title-text {
font-size: var(--lsd-h5-fontSize) !important;
line-height: var(--lsd-h5-lineHeight) !important;
font-size: var(--lsd-h4-fontSize) !important;
line-height: var(--lsd-h4-lineHeight) !important;
}
}
`
13 changes: 13 additions & 0 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ export default function App({ Component, pageProps }: AppLayoutProps) {
:root {
--lpe-nav-rendered-height: ${uiConfigs.navbarRenderedHeight}px;
--lpe-article-rendered-margin-top: ${uiConfigs.articleRenderedMT}px;
--lsd-h1-fontSize: 44px;
--lsd-h1-lineHeight: 54px;
--lsd-h2-fontSize: 36px;
--lsd-h2-lineHeight: 48px;
--lsd-h3-fontSize: 28px;
--lsd-h3-lineHeight: 42px;
--lsd-h4-fontSize: 20px;
--lsd-h4-lineHeight: 30px;
}
a,
Expand Down Expand Up @@ -114,6 +123,10 @@ export default function App({ Component, pageProps }: AppLayoutProps) {
.lsd-dropdown-item__label {
text-transform: capitalize;
}
.lsd-quote {
margin-block: 8px;
}
`}
/>
<QueryClientProvider client={queryClient}>
Expand Down

0 comments on commit f235eac

Please sign in to comment.