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

Fix font reset for headings #1760

Merged
merged 3 commits into from
Mar 22, 2019
Merged

Fix font reset for headings #1760

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
193b786
Fix heading font reset and button inherited font size
Mar 18, 2019
2e0c428
Fix reset
Mar 22, 2019
6adee01
cl
Mar 22, 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
1 change: 1 addition & 0 deletions src/components/button/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@mixin euiButton {
@include euiFont;
@include euiFontSize;

display: inline-block;
appearance: none;
Expand Down
9 changes: 7 additions & 2 deletions src/global_styling/reset/_reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,16 @@ time, mark, audio, video {
vertical-align: baseline;
}

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

h1, h2, h3, h4, h5, h6, p {
font-family: $euiFontFamily;
font-weight: $euiFontWeightRegular;
font-size: $euiFontSize;
}

input, textarea, select, button {
font-family: $euiFontFamily;
}
Expand Down Expand Up @@ -96,7 +102,6 @@ button {
padding: 0;
margin: 0;
outline: none;
font-size: $euiFontSize;
font-size: inherit;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Line 99 was removed because it was being directly overridden by the inherit and therefore was having no effect but clutter.

color: inherit;
border-radius: 0;
Expand Down