From 65ee86f1686d3a3f5a889b2b44329144fe7ef52c Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 4 Mar 2016 13:08:55 -0500 Subject: [PATCH] fix(label): change the flex for stacked and floating labels so buttons can be added fixes #5319 --- ionic/components/input/test/stacked-labels/main.html | 1 + ionic/components/label/label.scss | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ionic/components/input/test/stacked-labels/main.html b/ionic/components/input/test/stacked-labels/main.html index b5a3e11c38..ca59b8a602 100644 --- a/ionic/components/input/test/stacked-labels/main.html +++ b/ionic/components/input/test/stacked-labels/main.html @@ -16,6 +16,7 @@ Label 2 + diff --git a/ionic/components/label/label.scss b/ionic/components/label/label.scss index 3ca9788cbd..d08852ec33 100644 --- a/ionic/components/label/label.scss +++ b/ionic/components/label/label.scss @@ -34,10 +34,9 @@ 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], @@ -45,6 +44,7 @@ ion-label[floating] { align-self: stretch; margin-bottom: 0; max-width: 100%; + flex-basis: 100%; } ion-label[stacked],