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

Font reset is more precise, fix form label weights #1474

Merged
merged 2 commits into from
Jan 25, 2019
Merged

Font reset is more precise, fix form label weights #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bd30b8
Font reset is more precise, fix form label weights
snide Jan 24, 2019
98f9fbf
add pre
snide Jan 24, 2019
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
2 changes: 1 addition & 1 deletion src/components/form/form_label/_form_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
font-size: $euiFontSizeXS;
margin-bottom: $euiSizeS;
transition: all $euiAnimSpeedFast $euiAnimSlightResistance;
font-weight: $euiFontWeightMedium;
font-weight: $euiFontWeightSemiBold;

&.euiFormLabel-isInvalid {
color: $euiColorDanger; /* 1 */
Expand Down
14 changes: 5 additions & 9 deletions src/global_styling/reset/_reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
box-sizing: border-box;
}

/**
* 1. Inheriting the font will allow some browser defaults to take effect, e.g. Chrome applies
* `font: 11px system-ui` to the button element. We can't hardcode the font-family here because
* that will disrupt components which rely upon a different inherited font-family, e.g. code
* blocks.
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
Expand All @@ -32,13 +26,15 @@ time, mark, audio, video {
margin: 0;
padding: 0;
border: none;
font: inherit; /* 1 */
font-family: inherit; /* 1 */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the HTML tag below will still apply the correct font, which is why it's OK to remove it here.

vertical-align: baseline;
}

code, pre {
font-family: $euiCodeFontFamily;
}

input, textarea, select, button {
font-family: inherit; /* 1 */
font-family: $euiFontFamily;
}

em {
Expand Down