diff --git a/ionic/components/item/extensions/ios.scss b/ionic/components/item/extensions/ios.scss index 5d2321b7cc..3d22a817d8 100644 --- a/ionic/components/item/extensions/ios.scss +++ b/ionic/components/item/extensions/ios.scss @@ -6,12 +6,15 @@ $item-ios-border-color: #c8c7cc !default; $item-ios-font-size: 1.6rem !default; $item-ios-padding-top: 13px !default; -$item-ios-padding-right: 15px !default; +$item-ios-padding-right: 16px !default; $item-ios-padding-bottom: 14px !default; -$item-ios-padding-left: 15px !default; +$item-ios-padding-left: 16px !default; -$item-ios-avatar-size: 4rem !default; -$item-ios-thumbnail-size: 8rem !default; +$item-ios-padding-media-top: 10px !default; +$item-ios-padding-media-bottom: 11px !default; + +$item-ios-avatar-size: 3.6rem !default; +$item-ios-thumbnail-size: 5.6rem !default; $item-ios-note-color: #999 !default; @@ -42,12 +45,15 @@ $item-ios-note-color: #999 !default; .text-input, .input-label, - .item-media, .item-content, .item-note { margin: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left; } + .item-media { + margin: $item-ios-padding-media-top $item-ios-padding-right $item-ios-padding-media-bottom $item-ios-padding-left; + } + .item-note { color: $item-ios-note-color; } @@ -83,16 +89,6 @@ $item-ios-note-color: #999 !default; max-height: $item-ios-thumbnail-size; } - .vertical-align-top { - button, - [button] { - margin-top: $item-ios-padding-top; - } - > icon { - margin-top: $item-ios-padding-top / 2; - } - } - .item-input { &:before, &:after { @@ -103,6 +99,16 @@ $item-ios-note-color: #999 !default; } +.hairlines .list[mode="ios"] .item { + margin-top: -0.5px; + + &:before, + &:after { + border-top-width: 0.5px; + } + +} + /* .list[mode="ios"] { margin-top: -1px; diff --git a/ionic/components/item/extensions/material.scss b/ionic/components/item/extensions/material.scss index d80829d7fc..cab5cd3443 100644 --- a/ionic/components/item/extensions/material.scss +++ b/ionic/components/item/extensions/material.scss @@ -83,16 +83,6 @@ $item-md-note-color: #999 !default; max-height: $item-md-thumbnail-size; } - .vertical-align-top { - button, - [button] { - margin-top: $item-md-padding-top; - } - > icon { - margin-top: $item-md-padding-top / 2; - } - } - button.item.activated { box-shadow: none; } diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index 160c0f1a07..097e692cba 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -84,6 +84,10 @@ button.item.item { padding: 0; } +.item icon { + font-size: 2.4rem; +} + .list .item button.icon-only, .item button.icon-only icon { padding: 0; @@ -111,12 +115,13 @@ button.item.item { line-height: normal; margin: 0 0 3px 0; font-size: 1.4rem; + font-weight: normal; } p { line-height: normal; color: #666; - font-size: 1.4rem; + font-size: 1.2rem; margin: 0 0 2px; } @@ -151,6 +156,14 @@ button.item.item { margin-top: -13px; } +.item .item-media { + line-height: 1; + + img { + display: block; + } +} + /* .item-group-title { diff --git a/ionic/components/item/test/icons/main.html b/ionic/components/item/test/icons/main.html index 782048af20..4baf1c3e50 100644 --- a/ionic/components/item/test/icons/main.html +++ b/ionic/components/item/test/icons/main.html @@ -30,6 +30,13 @@ + +
+ Link with right side icon +
+ +
+ diff --git a/ionic/components/item/test/media/main.html b/ionic/components/item/test/media/main.html index 79bf75456f..8dee4260cc 100644 --- a/ionic/components/item/test/media/main.html +++ b/ionic/components/item/test/media/main.html @@ -1,10 +1,16 @@ Item Media + + - + + +