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

Increase font size for component description in reference docs #104

Merged
merged 10 commits into from
Jun 9, 2020
Merged

Increase font size for component description in reference docs #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9d9dd1
fix: Updates description in component reference docs to match Intro s…
Jun 8, 2020
3438051
Use className instead of class
Jun 8, 2020
e242b4b
Prettify code
Jun 8, 2020
7f90f2f
More prettify
Jun 8, 2020
35715a8
Add missing newline
Jun 8, 2020
596decb
Merge branch 'master' into increase_font_size_for_intro_paragraph_in_…
Jun 8, 2020
9541355
Merge branch 'master' into increase_font_size_for_intro_paragraph_in_…
Jun 9, 2020
fcd53df
Make sure we're matching all the elements that can appear under descr…
Jun 9, 2020
6df6c62
Fix specificity so we can just style the intro-text class
Jun 9, 2020
cef99df
Base ul line-height on the current font size
Jun 9, 2020
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: 2 additions & 4 deletions src/components/Intro.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.container p {
color: var(--color-neutrals-600);
font-size: 1.125rem;
line-height: 2rem;
.container {
composes: intro-text from global;
}
16 changes: 10 additions & 6 deletions src/components/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ body {
margin: 0;
font-size: 16px;
font-family: var(--primary-font-family);
color: var(--color-black);
color: var(--color-neutrals-700);
background-color: var(--color-white);
line-height: 1.2;
}
Expand All @@ -104,7 +104,6 @@ img {
p {
margin: 0;
margin-top: 8px;
color: var(--color-neutrals-700);
}

h1,
Expand Down Expand Up @@ -164,12 +163,17 @@ button,

ul {
padding-left: 30px;
font-size: 14px;
line-height: 22px;
color: var(--color-neutrals-700);
font-size: 1rem;
line-height: 1.6;
}

li {
margin-bottom: 1rem;
}

:global {
.intro-text {
color: var(--color-neutrals-600);
font-size: 1.125rem;
line-height: 2rem;
}
}
6 changes: 5 additions & 1 deletion src/templates/ComponentReferenceTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ const ComponentReferenceTemplate = ({ data }) => {
<h1>{component}</h1>

<section
className={cx(templateStyles.section, templateStyles.description)}
className={cx(
templateStyles.section,
templateStyles.description,
'intro-text'
)}
>
<ReactMarkdown source={componentDescription} />
</section>
Expand Down