Skip to content

Commit

Permalink
fix(input): IE always adding scrollbar to textarea (#4917)
Browse files Browse the repository at this point in the history
* Fixes IE always adding a scrollbar to Material textareas, even if they don't overflow.
* Removes a double theme toggle from the demo app. It was probably the result of a bad merge.
  • Loading branch information
crisbeto authored and andrewseguin committed Jun 5, 2017
1 parent 7f298f7 commit 6aaddbf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/demo-app/demo-app/demo-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<div class="demo-toolbar">
<h1>Angular Material Demos</h1>
<div>
<button md-button (click)="dark = !dark">{{dark ? 'Light' : 'Dark'}} theme</button>
<button md-button (click)="toggleChangeDetection()" title="Toggle change detection">
Change detection: {{changeDetectionStrategy}}
</button>
Expand Down
5 changes: 5 additions & 0 deletions src/lib/input/input-container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ $mat-input-underline-height: 1px !default;
pointer-events: none; // We shouldn't catch mouse events (let them through).
}

// Prevents IE from always adding a scrollbar by default.
textarea.mat-input-element {
overflow: auto;
}

// The placeholder label. This is invisible unless it is. The logic to show it is
// basically `empty || (float && (!empty || focused))`. Float is dependent on the
// `floatingPlaceholder` input.
Expand Down

0 comments on commit 6aaddbf

Please sign in to comment.