javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added multi button support

Browse Source
This commit is contained in:
Max Lynch
2013-12-10 20:10:57 -06:00
parent 52343d1b88
commit 1e07b821b4
3 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dist/css/ionic.css vendored
View File

@@ -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

10
scss/_items.scss
View File

@@ -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;
}
}

13
test/lists.html
View File

@@ -61,6 +61,19 @@
</button>
</div>
<div class="item item-icon-left item-button-right">
<i class="icon ion-chatbubble-working ion-primary"></i>
Call Ma
<div class="buttons">
<button class="button button-positive">
<i class="icon ion-ios7-telephone"></i>
</button>
<button class="button button-balanced">
<i class="icon ion-ios7-camera"></i>
</button>
</div>
</div>
<div class="item item-button-left">
<button class="button button-positive">
<i class="icon ion-ios7-telephone"></i>