Skip to content

Commit

Permalink
fix(label): change the flex for stacked and floating labels so button…
Browse files Browse the repository at this point in the history
…s can be added

fixes #5319
  • Loading branch information
brandyscarney committed Mar 4, 2016
1 parent bc06994 commit 65ee86f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions ionic/components/input/test/stacked-labels/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<ion-item>
<ion-label stacked>Label 2</ion-label>
<ion-input value="Text 2"></ion-input>
<button item-right clear><ion-icon name="heart"></ion-icon></button>
</ion-item>

<ion-item>
Expand Down
8 changes: 4 additions & 4 deletions ionic/components/label/label.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ ion-label[fixed] {
max-width: 200px;
}

.item-label-stacked,
.item-label-floating {
flex-direction: column;
align-items: flex-start;
.item-label-stacked .item-inner,
.item-label-floating .item-inner {
flex-wrap: wrap;
}

ion-label[stacked],
ion-label[floating] {
align-self: stretch;
margin-bottom: 0;
max-width: 100%;
flex-basis: 100%;
}

ion-label[stacked],
Expand Down

0 comments on commit 65ee86f

Please sign in to comment.