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

Jump to bottom

fix(text-field): Update typography #2606

Merged
merged 5 commits into from
Apr 20, 2018
Merged

fix(text-field): Update typography #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe79aa4
fix(text-field): Update typography
williamernest Apr 19, 2018
c1f8d20
fix(text-field): Remove dependency on 1.15 line height for default te…
williamernest Apr 20, 2018
1292482
fix(text-field): Update select to remove line-height.
williamernest Apr 20, 2018
b1880a3
fix(text-field): Revert changes to select to move to separate PR
williamernest Apr 20, 2018
4fcb14f
Merge branch 'master' into fix/text-field/update-typography
williamernest Apr 20, 2018
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: 0 additions & 1 deletion packages/mdc-textfield/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@

.mdc-text-field__input {
display: flex;
height: 30px;
padding: 12px;
border: none;
background-color: transparent;
Expand Down
14 changes: 3 additions & 11 deletions packages/mdc-textfield/mdc-text-field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,16 @@
}

.mdc-text-field__input {
@include mdc-typography-base;
// We use only a subset of the MDC typography values here as changing things such as line-height
// affects how the labels are transformed.
// TODO: Re-add setting the font-size from mdc-typography-styles (currently
// setting it here has no effect because it is overriden by the font-size
// given below).
@each $prop in (letter-spacing) {
#{$prop}: map-get(map-get($mdc-typography-styles, subtitle1), $prop);
}
@include mdc-typography(subtitle1);

width: 100%;
padding: 20px 0 8px;
height: 30px;
padding: 20px 0 1px;
transition: mdc-text-field-transition(opacity);
border: none;
border-bottom: 1px solid;
border-radius: 0;
background: none;
font-size: inherit;
appearance: none;

&::placeholder {
Expand Down