javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 15:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

.item-complex updates

Browse Source
This commit is contained in:
Adam Bradley
2013-11-12 11:02:04 -06:00
parent aed30fd2d7
commit 4104be33e3
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/ionic.css vendored
View File

@ -3430,9 +3430,13 @@ a.item {
* -------------------------------------------------- * --------------------------------------------------
* Adding .item-complex allows the .item to be slidable and * Adding .item-complex allows the .item to be slidable and
* have options underneath the button, but also requires an * have options underneath the button, but also requires an
* additional .item-content element inside .item * additional .item-content element inside .item.
* Basically .item-complex removes any default settings which
* .item added, so that .item-content looks them as just .item.
*/ */
.item-complex { .item-complex,
a.item.item-complex,
button.item.item-complex {
padding: 0; } padding: 0; }
.item-complex .item-content, .item-complex .item-content,

8
scss/_items.scss
View File

@ -128,10 +128,14 @@ a.item {
* -------------------------------------------------- * --------------------------------------------------
* Adding .item-complex allows the .item to be slidable and * Adding .item-complex allows the .item to be slidable and
* have options underneath the button, but also requires an * have options underneath the button, but also requires an
* additional .item-content element inside .item * additional .item-content element inside .item.
* Basically .item-complex removes any default settings which
* .item added, so that .item-content looks them as just .item.
*/ */
.item-complex { .item-complex,
a.item.item-complex,
button.item.item-complex {
padding: 0; padding: 0;
} }
.item-complex .item-content, .item-complex .item-content,

6
test/lists.html
View File

@ -279,7 +279,7 @@
</div> </div>
</a> </a>
<a href="#" class="item item-icon-left item-icon-right item-slider"> <a href="#" class="item item-complex item-icon-left item-icon-right item-slider">
<div class="item-content slide-left"> <div class="item-content slide-left">
<i class="icon ion-image brand-warning fill-icon"></i> <i class="icon ion-image brand-warning fill-icon"></i>
Driving Directions Driving Directions
@ -340,7 +340,7 @@
<i class="icon ion-chevron-right"></i> <i class="icon ion-chevron-right"></i>
</a> </a>
<a href="#" class="item item-icon-left item-icon-right item-slider"> <a href="#" class="item item-complex item-icon-left item-icon-right item-slider">
<div class="item-content slide-left slide-right"> <div class="item-content slide-left slide-right">
<i class="icon ion-ios7-cog gray fill-icon"></i> <i class="icon ion-ios7-cog gray fill-icon"></i>
Default no wrap and has item-content! This is a list item with really really really really really Default no wrap and has item-content! This is a list item with really really really really really
@ -353,7 +353,7 @@
</div> </div>
</a> </a>
<a href="#" class="item item-icon-left item-icon-right item-text-wrap item-slider"> <a href="#" class="item item-complex item-icon-left item-icon-right item-text-wrap item-slider">
<div class="item-content slide-left slide-right"> <div class="item-content slide-left slide-right">
<i class="icon ion-ios7-cog gray fill-icon"></i> <i class="icon ion-ios7-cog gray fill-icon"></i>
Assigned "item-text-wrap" and has item-content. This is a list item with really really really really really Assigned "item-text-wrap" and has item-content. This is a list item with really really really really really