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 MS Edge and Firefox issues #342, #388 #393

Merged
merged 5 commits into from
May 12, 2016
Merged

Fix MS Edge and Firefox issues #342, #388 #393

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
cde1078
Merge pull request #1 from angular/master
davidgabrichidze May 4, 2016
2170ff4
input's maxLength=-1 property not works in MS Edge
davidgabrichidze May 4, 2016
d910023
after @jelbourn review
davidgabrichidze May 9, 2016
ee1cac0
Merge remote-tracking branch 'upstream/master'
davidgabrichidze May 11, 2016
4e914ab
to placeholder, or not to placeholder? let's use the mixin.
davidgabrichidze May 11, 2016
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
14 changes: 10 additions & 4 deletions src/components/input/input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@ $md-input-underline-focused-color: md-color($md-primary);
$md-input-underline-disabled-background-image: linear-gradient(to right,
rgba(0,0,0,0.26) 0%, rgba(0,0,0,0.26) 33%, transparent 0%);

/**
* Undo the red box-shadow glow added by Firefox on invalid inputs.
* See https://developer.mozilla.org/en-US/docs/Web/CSS/:-moz-ui-invalid
*/
:-moz-ui-invalid {
box-shadow: none;
}

/**
* Applies a floating placeholder above the input itself.
*/
%md-input-placeholder-floating {
@mixin md-input-placeholder-floating {
visibility: visible;
padding-bottom: 5px;
transform: translateY(-100%) scale(0.75);
Expand All @@ -33,7 +40,6 @@ $md-input-underline-disabled-background-image: linear-gradient(to right,
}
}


:host {
display: inline-block;
position: relative;
Expand Down Expand Up @@ -120,7 +126,7 @@ $md-input-underline-disabled-background-image: linear-gradient(to right,

// Show the placeholder above the input when it's not empty, or focused.
&.md-float:not(.md-empty), &.md-float.md-focused {
@extend %md-input-placeholder-floating;
@include md-input-placeholder-floating;
}

// :focus is applied to the input, but we apply md-focused to the other elements
Expand All @@ -143,7 +149,7 @@ $md-input-underline-disabled-background-image: linear-gradient(to right,
// Once the autofill is committed, a change event happen and the regular md-input
// classes take over to fulfill this behaviour.
input:-webkit-autofill + .md-input-placeholder {
@extend %md-input-placeholder-floating;
@include md-input-placeholder-floating;
}

// The underline is what's shown under the input, its prefix and its suffix.
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class MdInput implements ControlValueAccessor, AfterContentInit, OnChange
@Input() @BooleanFieldValue() floatingPlaceholder: boolean = true;
@Input() hintLabel: string = '';
@Input() id: string = `md-input-${nextUniqueId++}`;
@Input() maxLength: number = -1;
@Input() maxLength: number = null;
@Input() placeholder: string;
@Input() @BooleanFieldValue() required: boolean = false;
@Input() @BooleanFieldValue() spellcheck: boolean = false;
Expand Down