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(select): Override floating label properties in select box #2574

Merged
merged 7 commits into from
Apr 18, 2018
Merged

fix(select): Override floating label properties in select box #2574

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf653f5
fix(select): Override floating label properties in select box
williamernest Apr 16, 2018
76b061d
fix(select): Cleanup box css
williamernest Apr 16, 2018
0dec834
WIP: moved pointer events none
Apr 16, 2018
01f995b
Merge branch 'fix/select/label-adjustments' of github.com:material-co…
Apr 16, 2018
13d5f35
fix(select): Fix BEM issue
williamernest Apr 17, 2018
5e557f7
fix(select): Update lint to skip next line
williamernest Apr 18, 2018
f940a85
Merge branch 'master' into fix/select/label-adjustments
williamernest Apr 18, 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
12 changes: 5 additions & 7 deletions packages/mdc-select/mdc-select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
}

width: 100%;
padding-top: 22px;
padding-bottom: 8px;
padding-top: 20px;
padding-bottom: 6px;
border: none;
border-bottom: 1px solid;
border-radius: 0;
Expand Down Expand Up @@ -114,12 +114,8 @@
background-position: left 10px center;
}

.mdc-select__native-control,
.mdc-select__label {
@include mdc-typography(subtitle1);
}

.mdc-select__native-control {
@include mdc-typography(subtitle1);
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm guessing this was removed from label to fix line-height, but do we not want other properties of this style?

Copy link
Contributor Author

@williamernest williamernest Apr 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

The .mdc-select__label was accidentally left in from the refactor to use mdc-floating-label. mdc-floating-label is already setting the required typography for the label in the mdc-floating-label package.

@include mdc-rtl-reflexive-property(padding, $mdc-select-label-padding, $mdc-select-arrow-padding);

height: 56px;
Expand All @@ -131,6 +127,8 @@
@include mdc-rtl-reflexive-position(left, 16px);

bottom: 12px;
line-height: 1.75rem;
pointer-events: none;

&--float-above {
transform: translateY(-40%) scale(.75, .75);
Expand Down