diff --git a/ionic/components/checkbox/modes/md.scss b/ionic/components/checkbox/modes/md.scss
index 85c3b492c2..37a33323db 100644
--- a/ionic/components/checkbox/modes/md.scss
+++ b/ionic/components/checkbox/modes/md.scss
@@ -36,7 +36,8 @@ ion-checkbox {
media-checkbox {
display: block;
- margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom ($item-md-padding-left / 2);
+ // TODO convert these to sass variables
+ margin: $item-md-padding-media-top 36px $item-md-padding-media-bottom 4px;
}
checkbox-icon {
diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss
index 0329601170..5c73ff184b 100644
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@@ -18,6 +18,20 @@
background-color: $list-background-color;
color: $list-text-color;
+
+ box-sizing: border-box;
+}
+
+.item-inner {
+ width: 100%;
+ display: flex;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ align-items: center;
+ overflow: hidden;
+ align-self: stretch;
+ box-sizing: border-box;
}
.item-group {
@@ -55,18 +69,6 @@ button.item.item {
will-change: initial;
}
-.item-inner {
- // height: 100%;
- width: 100%;
- display: flex;
- margin: 0;
- padding: 0;
- border: 0;
- align-items: center;
- overflow: hidden;
- align-self: stretch;
-}
-
ion-item-content {
margin: 0;
flex: 1;
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index b52da5238a..248f3b5a0b 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -38,7 +38,9 @@ $list-ios-header-color: #333 !default;
}
ion-header + .item,
- ion-item-group-title + .item {
+ ion-header + script + .item,
+ ion-item-group-title + .item,
+ ion-item-group-title + script + .item {
border-top: 1px solid $item-ios-border-color;
.item-inner {
@@ -48,7 +50,7 @@ $list-ios-header-color: #333 !default;
.item {
border-radius: 0;
- margin-top: -1px;
+ // margin-top: -1px;
padding-left: $item-ios-padding-left;
font-size: $item-ios-font-size;
@@ -71,7 +73,7 @@ $list-ios-header-color: #333 !default;
}
ion-item-content {
- //margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
+ margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
}
}
@@ -203,15 +205,17 @@ ion-card {
button, [button] {
min-height: calc(100% - 1px);
height: calc(100% - 1px);
- margin-top: 0.55px;
+ //margin-top: 0.55px;
margin-bottom: 0.55px;
}
}
ion-header + .item,
- ion-item-group-title + .item {
+ ion-header + script + .item,
+ ion-item-group-title + .item,
+ ion-item-group-title + script + .item {
border-top-width: 0.55px;
- margin-top: -0.55px;
+ //margin-top: -0.55px;
.item-inner {
border-width: 0;
@@ -219,7 +223,7 @@ ion-card {
}
.item {
- margin-top: -0.55px;
+ //margin-top: -0.55px;
.item-inner {
border-width: 0.55px;
@@ -235,7 +239,7 @@ ion-card {
&:last-child {
border-bottom-width: 0.55px;
- margin-bottom: -0.55px;
+ //margin-bottom: -0.55px;
}
}
}
diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss
index f44f6ca56d..d59253379e 100644
--- a/ionic/components/list/modes/md.scss
+++ b/ionic/components/list/modes/md.scss
@@ -34,10 +34,24 @@ $list-md-header-color: #858585 !default;
margin-left: $item-md-padding-left;
font-size: $item-md-font-size;
text-transform: none;
+
+ &:last-child {
+ border-bottom: 1px solid $item-md-border-color;
+ }
+ }
+
+ .item[no-lines],
+ .item[no-lines] + .item {
+ border-width: 0;
+ .item-inner {
+ border-width: 0;
+ }
}
ion-header + .item,
- ion-item-group-title + .item {
+ ion-header + script + .item,
+ ion-item-group-title + .item,
+ ion-item-group-title + script + .item {
margin-left: 0;
padding-left: $item-md-padding-left;
}
@@ -54,6 +68,7 @@ $list-md-header-color: #858585 !default;
icon[item-left],
icon[item-right] {
margin-top: $item-md-padding-icon-top;
+ margin-left: 0;
margin-bottom: $item-md-padding-icon-bottom;
}
@@ -100,7 +115,7 @@ $list-md-header-color: #858585 !default;
margin: 4px;
}
- icon[item-left] + ion-item-content,
+ icon[item-left] + .item-inner,
icon[item-left] + [text-input] {
margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
}
@@ -207,12 +222,14 @@ $list-md-header-color: #858585 !default;
border-radius: $list-inset-md-border-radius;
.item:first-child {
+ border-top-width: 0;
margin-top: 0;
border-top-right-radius: $list-inset-md-border-radius;
border-top-left-radius: $list-inset-md-border-radius;
}
.item:last-child {
+ border-bottom-width: 0;
margin-bottom: 0;
border-bottom-right-radius: $list-inset-md-border-radius;
border-bottom-left-radius: $list-inset-md-border-radius;
@@ -238,7 +255,9 @@ $list-md-header-color: #858585 !default;
}
ion-header + .item,
- ion-item-group-title + .item {
+ ion-header + script + .item,
+ ion-item-group-title + .item,
+ ion-item-group-title + script + .item {
border-width: 1px !important;
}
}
diff --git a/ionic/util/util.scss b/ionic/util/util.scss
index 15a6b3d186..3fcad7487d 100755
--- a/ionic/util/util.scss
+++ b/ionic/util/util.scss
@@ -15,11 +15,6 @@
transition: none !important;
}
-// Remove any hairline borders
-.no-border:after {
- background: none !important;
-}
-
.hide,
[hidden],
template,