diff --git a/ionic/components/form/test/placeholder-text-input/main.html b/ionic/components/form/test/placeholder-text-input/main.html index d801700e66..ec99eab2b9 100644 --- a/ionic/components/form/test/placeholder-text-input/main.html +++ b/ionic/components/form/test/placeholder-text-input/main.html @@ -11,7 +11,17 @@ - + + + + + + + + + + + diff --git a/ionic/components/item/extensions/ios.scss b/ionic/components/item/extensions/ios.scss index 4b6cb3a367..f915500513 100644 --- a/ionic/components/item/extensions/ios.scss +++ b/ionic/components/item/extensions/ios.scss @@ -43,7 +43,6 @@ $item-ios-note-color: #999 !default; } } - .text-input, .input-label, .item-content, .item-note { @@ -54,6 +53,11 @@ $item-ios-note-color: #999 !default; margin: $item-ios-padding-media-top $item-ios-padding-right $item-ios-padding-media-bottom $item-ios-padding-left; } + .text-input { + margin: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left; + padding: 0; + } + .item-note { color: $item-ios-note-color; } @@ -90,13 +94,6 @@ $item-ios-note-color: #999 !default; max-height: $item-ios-thumbnail-size; } - .item-input { - &:before, - &:after { - left: 0; - } - } - } diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index 8b9e0bfa8e..a95e5cb77b 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -71,7 +71,8 @@ button.item.item { .item-content + icon, .item-media + .item-content, .item-content + .item-media, - .item-content + .item-content { + .item-content + .item-content, + icon + .input { margin-left: 0; } diff --git a/ionic/util/mixins.scss b/ionic/util/mixins.scss index d7268ed620..3fafad8f80 100644 --- a/ionic/util/mixins.scss +++ b/ionic/util/mixins.scss @@ -38,7 +38,7 @@ // Input Placeholder // -------------------------------------------------- -@mixin placeholder($color: #aaaaaa, $text-indent: 0) { +@mixin placeholder($color: #999, $text-indent: 0) { &::-moz-placeholder { // Firefox 19+ color: $color; }