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

.item-body .item-content updates

Browse Source
This commit is contained in:
Adam Bradley
2013-10-24 21:43:13 -05:00
parent e6f139b1b2
commit 11e6f654ea
5 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/ionic-ios7.css vendored
View File

@ -1220,15 +1220,19 @@ button.item-icon-right .item-content:after {
width: 100%; } width: 100%; }
.item-image .item-content { .item-image .item-content {
text-align: center; padding: 0;
padding: 0; } text-align: center; }
.item-image .item-content img:first-child, .item-image .item-content .list-img { .item-image .item-content img:first-child, .item-image .item-content .list-img {
width: 100%; } width: 100%; }
.item-body .item-content { .item-body .item-content {
padding: 15px; } overflow: auto;
padding: 15px;
text-overflow: inherit;
white-space: normal; }
.item-body .item-content h1, .item-body .item-content h2, .item-body .item-content h3, .item-body .item-content h4, .item-body .item-content h5, .item-body .item-content h6, .item-body .item-content p { .item-body .item-content h1, .item-body .item-content h2, .item-body .item-content h3, .item-body .item-content h4, .item-body .item-content h5, .item-body .item-content h6, .item-body .item-content p {
margin: 15px; } margin-top: 15px;
margin-bottom: 15px; }
.item-divider { .item-divider {
margin: -1px; margin: -1px;

12
dist/css/ionic-scoped.css vendored
View File

@ -1931,14 +1931,18 @@
max-height: 80px; max-height: 80px;
width: 100%; } width: 100%; }
.ionic .item-image .item-content { .ionic .item-image .item-content {
text-align: center; padding: 0;
padding: 0; } text-align: center; }
.ionic .item-image .item-content img:first-child, .ionic .item-image .item-content .list-img { .ionic .item-image .item-content img:first-child, .ionic .item-image .item-content .list-img {
width: 100%; } width: 100%; }
.ionic .item-body .item-content { .ionic .item-body .item-content {
padding: 15px; } overflow: auto;
padding: 15px;
text-overflow: inherit;
white-space: normal; }
.ionic .item-body .item-content h1, .ionic .item-body .item-content h2, .ionic .item-body .item-content h3, .ionic .item-body .item-content h4, .ionic .item-body .item-content h5, .ionic .item-body .item-content h6, .ionic .item-body .item-content p { .ionic .item-body .item-content h1, .ionic .item-body .item-content h2, .ionic .item-body .item-content h3, .ionic .item-body .item-content h4, .ionic .item-body .item-content h5, .ionic .item-body .item-content h6, .ionic .item-body .item-content p {
margin: 15px; } margin-top: 15px;
margin-bottom: 15px; }
.ionic .item-divider { .ionic .item-divider {
margin: -1px; margin: -1px;
padding: 5px 15px; padding: 5px 15px;

12
dist/css/ionic.css vendored
View File

@ -2363,15 +2363,19 @@ button.item-icon-right .item-content:after {
width: 100%; } width: 100%; }
.item-image .item-content { .item-image .item-content {
text-align: center; padding: 0;
padding: 0; } text-align: center; }
.item-image .item-content img:first-child, .item-image .item-content .list-img { .item-image .item-content img:first-child, .item-image .item-content .list-img {
width: 100%; } width: 100%; }
.item-body .item-content { .item-body .item-content {
padding: 15px; } overflow: auto;
padding: 15px;
text-overflow: inherit;
white-space: normal; }
.item-body .item-content h1, .item-body .item-content h2, .item-body .item-content h3, .item-body .item-content h4, .item-body .item-content h5, .item-body .item-content h6, .item-body .item-content p { .item-body .item-content h1, .item-body .item-content h2, .item-body .item-content h3, .item-body .item-content h4, .item-body .item-content h5, .item-body .item-content h6, .item-body .item-content p {
margin: 15px; } margin-top: 15px;
margin-bottom: 15px; }
.item-divider { .item-divider {
margin: -1px; margin: -1px;

8
scss/ionic/_items.scss
View File

@ -221,8 +221,8 @@ button.item-icon-right {
// ------------------------------- // -------------------------------
.item-image .item-content { .item-image .item-content {
text-align: center;
padding: 0; padding: 0;
text-align: center;
img:first-child, .list-img { img:first-child, .list-img {
width: 100%; width: 100%;
@ -234,10 +234,14 @@ button.item-icon-right {
// ------------------------------- // -------------------------------
.item-body .item-content { .item-body .item-content {
overflow: auto;
padding: $item-padding; padding: $item-padding;
text-overflow: inherit;
white-space: normal;
h1, h2, h3, h4, h5, h6, p { h1, h2, h3, h4, h5, h6, p {
margin: $item-padding; margin-top: $item-padding;
margin-bottom: $item-padding;
} }
} }

6
test/cards.html
View File

@ -18,7 +18,7 @@
<main class="content has-header"> <main class="content has-header">
<div class="card"> <div class="card">
<div class="item item-content"> <div class="item item-content item-text-wrap">
This is a basic Card with some text. This is a basic Card with some text.
</div> </div>
</div> </div>
@ -27,7 +27,7 @@
<div class="item item-divider"> <div class="item item-divider">
I'm a Header in a Card! I'm a Header in a Card!
</div> </div>
<div class="item item-content"> <div class="item item-content item-text-wrap">
This is a basic Card with some text. This is a basic Card with some text.
</div> </div>
</div> </div>
@ -36,7 +36,7 @@
<div class="item item-divider"> <div class="item item-divider">
I'm a Header in a Card! I'm a Header in a Card!
</div> </div>
<div class="item item-content"> <div class="item item-content item-text-wrap">
This is a basic Card with some text. This is a basic Card with some text.
</div> </div>
<div class="item item-divider"> <div class="item item-divider">