From 5fb1e08347cdf9a413ab995027f3146d2921e2e4 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 1 Mar 2016 12:59:29 -0500 Subject: [PATCH] fix(toolbar): add a min-width to the toolbar content so that it won't overlap buttons fixes #5657 --- .../toolbar/test/scenarios/main.html | 18 +++++++++++++++++- ionic/components/toolbar/toolbar.ios.scss | 1 + ionic/components/toolbar/toolbar.md.scss | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html index be6f13db2c3..7fe453ae2c9 100644 --- a/ionic/components/toolbar/test/scenarios/main.html +++ b/ionic/components/toolbar/test/scenarios/main.html @@ -2,6 +2,22 @@ This is the title that never ends. It just goes on and on my friend. + + + + + + + + + This is a long title with buttons. It just goes on and on my friend. + @@ -207,4 +223,4 @@ .toolbar { border-bottom: 1px solid black; } - \ No newline at end of file + diff --git a/ionic/components/toolbar/toolbar.ios.scss b/ionic/components/toolbar/toolbar.ios.scss index c2923404810..75f6721faa6 100644 --- a/ionic/components/toolbar/toolbar.ios.scss +++ b/ionic/components/toolbar/toolbar.ios.scss @@ -57,6 +57,7 @@ ion-navbar-section { .toolbar-content { flex: 1; order: map-get($toolbar-order-ios, content); + min-width: 0; } .toolbar-title { diff --git a/ionic/components/toolbar/toolbar.md.scss b/ionic/components/toolbar/toolbar.md.scss index bc8304f199d..f227617116d 100644 --- a/ionic/components/toolbar/toolbar.md.scss +++ b/ionic/components/toolbar/toolbar.md.scss @@ -52,6 +52,7 @@ ion-navbar-section { flex: 1; order: map-get($toolbar-order-md, content); max-width: 100%; + min-width: 0; } .toolbar-title {