Skip to content

Commit

Permalink
fix(select): floating label
Browse files Browse the repository at this point in the history
fixes #12068
  • Loading branch information
manucorporat committed Jun 19, 2017
1 parent d8b65da commit e3a8d27
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
</button>

<ion-item>
<ion-label>DateTime</ion-label>
<ion-label floating>DateTime</ion-label>
<ion-datetime [(ngModel)]="datetime" min="1994-03-14" max="2017-12-09" displayFormat="MM/DD/YYYY" required [disabled]='disabled'></ion-datetime>
</ion-item>

<ion-item>
<ion-label>Select</ion-label>
<ion-label floating>Select</ion-label>
<ion-select [(ngModel)]="select" [disabled]='strDisabled()'>
<ion-option value="">No Game Console</ion-option>
<ion-option value="nes">NES</ion-option>
<ion-option value="n64">Nintendo64</ion-option>
<ion-option value="ps">PlayStation</ion-option>
Expand All @@ -42,7 +43,7 @@
</ion-item>

<ion-item>
<ion-label>Input (text)</ion-label>
<ion-label floating>Input (text)</ion-label>
<ion-input [(ngModel)]="text" [disabled]='disabled'></ion-input>
</ion-item>

Expand Down
1 change: 1 addition & 0 deletions src/components/select/select.ts
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ export class Select extends BaseInput<any> implements OnDestroy {
}

this._text = this._texts.join(', ');
super._inputUpdated();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ion-content class="outer-content">

<ion-item>
<ion-label>Gender</ion-label>
<ion-label stacked>Gender</ion-label>
<ion-select [(ngModel)]="gender" class="e2eSelectGender">
<ion-option value="f">Female</ion-option>
<ion-option value="m">Male</ion-option>
Expand Down Expand Up @@ -39,7 +39,7 @@
</ion-item>

<ion-item>
<ion-label>Operating System</ion-label>
<ion-label floating>Operating System</ion-label>
<ion-select [(ngModel)]="os" interface="alert" submitText="Okay" cancelText="Nah">
<ion-option value="dos">DOS</ion-option>
<ion-option value="lunix">Linux</ion-option>
Expand Down

0 comments on commit e3a8d27

Please sign in to comment.