Skip to content

Update MatFormField outline DOM structure #11771

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

Merged
merged 3 commits into from
Jun 26, 2018
Merged

Update MatFormField outline DOM structure #11771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e9b321
Modified Material FormField template so outline DOM is contained with…
glouischandra Jun 13, 2018
92c9bd1
Removed extra whitespace in previous commit
glouischandra Jun 14, 2018
c22ba7b
Removed bottom text styling from form-field-outline-theme.scss since …
glouischandra Jun 15, 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
6 changes: 0 additions & 6 deletions src/lib/form-field/_form-field-outline-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ $mat-form-field-outline-dedupe: 0;
padding: $infix-padding 0 $infix-padding 0;
}

.mat-form-field-outline {
// We want the bottom of the outline to start at the end of the content box, not the padding
// box, so we move it up by the padding amount.
bottom: $wrapper-padding-bottom;
}

.mat-form-field-label {
top: $infix-margin-top + $infix-padding;
margin-top: $outline-appearance-label-offset;
Expand Down
8 changes: 5 additions & 3 deletions src/lib/form-field/form-field-outline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ $mat-form-field-outline-subscript-padding:
.mat-form-field-flex {
padding: 0 $mat-form-field-outline-side-padding 0 $mat-form-field-outline-side-padding;
margin-top: -$mat-form-field-outline-label-overlap;
position: relative;
}

.mat-form-field-prefix,
Expand All @@ -41,9 +42,10 @@ $mat-form-field-outline-subscript-padding:
.mat-form-field-outline {
display: flex;
position: absolute;
top: 0;
top: $mat-form-field-outline-label-overlap;
left: 0;
right: 0;
bottom: 0;
pointer-events: none;
}

Expand Down Expand Up @@ -117,12 +119,12 @@ $mat-form-field-outline-subscript-padding:
}

&:not(.mat-form-field-disabled) .mat-form-field-flex:hover {
& ~ .mat-form-field-outline {
& .mat-form-field-outline {
opacity: 0;
transition: opacity 600ms $swift-ease-out-timing-function;
}

& ~ .mat-form-field-outline-thick {
& .mat-form-field-outline-thick {
opacity: 1;
}
}
Expand Down
29 changes: 15 additions & 14 deletions src/lib/form-field/form-field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
<div class="mat-form-field-wrapper">
<div class="mat-form-field-flex" #connectionContainer
(click)="_control.onContainerClick && _control.onContainerClick($event)">

<!-- Outline used for outline appearance. -->
<ng-container *ngIf="appearance == 'outline'">
<div class="mat-form-field-outline">
<div class="mat-form-field-outline-start" [style.width.px]="_outlineGapStart"></div>
<div class="mat-form-field-outline-gap" [style.width.px]="_outlineGapWidth"></div>
<div class="mat-form-field-outline-end"></div>
</div>
<div class="mat-form-field-outline mat-form-field-outline-thick">
<div class="mat-form-field-outline-start" [style.width.px]="_outlineGapStart"></div>
<div class="mat-form-field-outline-gap" [style.width.px]="_outlineGapWidth"></div>
<div class="mat-form-field-outline-end"></div>
</div>
</ng-container>

<div class="mat-form-field-prefix" *ngIf="_prefixChildren.length">
<ng-content select="[matPrefix]"></ng-content>
</div>
Expand Down Expand Up @@ -52,20 +67,6 @@
[class.mat-warn]="color == 'warn'"></span>
</div>

<!-- Outline used for outline appearance. -->
<ng-container *ngIf="appearance == 'outline'">
<div class="mat-form-field-outline">
<div class="mat-form-field-outline-start" [style.width.px]="_outlineGapStart"></div>
<div class="mat-form-field-outline-gap" [style.width.px]="_outlineGapWidth"></div>
<div class="mat-form-field-outline-end"></div>
</div>
<div class="mat-form-field-outline mat-form-field-outline-thick">
<div class="mat-form-field-outline-start" [style.width.px]="_outlineGapStart"></div>
<div class="mat-form-field-outline-gap" [style.width.px]="_outlineGapWidth"></div>
<div class="mat-form-field-outline-end"></div>
</div>
</ng-container>

<div class="mat-form-field-subscript-wrapper"
[ngSwitch]="_getDisplayedMessages()">
<div *ngSwitchCase="'error'" [@transitionMessages]="_subscriptAnimationState">
Expand Down