From 1e07b821b44d62aaac925c3d8b213e13ccfd5edf Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 10 Dec 2013 20:10:57 -0600 Subject: [PATCH] Added multi button support --- dist/css/ionic.css | 15 +++++++++++++-- scss/_items.scss | 10 +++++++++- test/lists.html | 13 +++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index ad0c3730a6..2781e772de 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -3953,7 +3953,9 @@ button.item.item-button-right { padding-right: 75px; } .item-button-right > .button, -.item-button-right .item-content > .button { +.item-button-right .item-content > .button, +.item-button-right > .buttons, +.item-button-right .item-content > .buttons { display: -webkit-box; display: -webkit-flex; display: -moz-box; @@ -3972,11 +3974,20 @@ button.item.item-button-right { min-height: 32px; font-size: 32px; } .item-button-right > .button .icon, - .item-button-right .item-content > .button .icon { + .item-button-right .item-content > .button .icon, + .item-button-right > .buttons .icon, + .item-button-right .item-content > .buttons .icon { position: relative; left: auto; width: auto; line-height: 31px; } + .item-button-right > .button > .button, + .item-button-right .item-content > .button > .button, + .item-button-right > .buttons > .button, + .item-button-right .item-content > .buttons > .button { + min-height: 32px; + font-size: 32px; + margin: 0px 2px; } /** * Auto Right Arrow Icon diff --git a/scss/_items.scss b/scss/_items.scss index 58fe8025c5..2b0bacf0db 100644 --- a/scss/_items.scss +++ b/scss/_items.scss @@ -322,7 +322,9 @@ button.item.item-button-right { } .item-button-right > .button, -.item-button-right .item-content > .button { +.item-button-right .item-content > .button, +.item-button-right > .buttons, +.item-button-right .item-content > .buttons { @include display-flex(); @include align-items(center); position: absolute; @@ -338,6 +340,12 @@ button.item.item-button-right { width: auto; line-height: $item-icon-font-size - 1; } + + > .button { + min-height: $item-icon-font-size; + font-size: $item-icon-font-size; + margin: 0px 2px; + } } diff --git a/test/lists.html b/test/lists.html index cb122c7640..12419227e3 100644 --- a/test/lists.html +++ b/test/lists.html @@ -61,6 +61,19 @@ +
+ + Call Ma +
+ + +
+
+