From bf4eea3fb2f604bb5c9e3be18da1b4fb6532b6d0 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 31 Aug 2015 15:12:24 -0500 Subject: [PATCH] md item border colors --- ionic/components/checkbox/modes/material.scss | 2 +- ionic/components/item/modes/material.scss | 9 +++++++-- ionic/components/radio/modes/material.scss | 2 +- ionic/components/switch/modes/material.scss | 2 +- ionic/ionic.material.scss | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ionic/components/checkbox/modes/material.scss b/ionic/components/checkbox/modes/material.scss index b00a3c7919..999727539a 100644 --- a/ionic/components/checkbox/modes/material.scss +++ b/ionic/components/checkbox/modes/material.scss @@ -6,7 +6,7 @@ $checkbox-md-icon-size: 16px !default; $checkbox-md-bg-color-off: $list-background-color !default; $checkbox-md-border-width: 2px !default; $checkbox-md-border-radius: 2px !default; -$checkbox-md-border-color-off: $list-border-color !default; +$checkbox-md-border-color-off: darken($item-md-border-color, 40%) !default; $checkbox-md-bg-color-on: color(primary) !default; $checkbox-md-border-color-on: color(primary) !default; $checkbox-md-checkmark-color-on: $background-color !default; diff --git a/ionic/components/item/modes/material.scss b/ionic/components/item/modes/material.scss index 6ee08c1965..a9b067fb16 100644 --- a/ionic/components/item/modes/material.scss +++ b/ionic/components/item/modes/material.scss @@ -2,7 +2,7 @@ // Material Design Item // -------------------------------------------------- -$item-md-border-color: lighten($list-border-color, 10%) !default; +$item-md-border-color: grayscale(lighten($list-border-color, 8%)) !default; $item-md-font-size: 1.6rem !default; $item-md-padding-top: 13px !default; @@ -44,10 +44,15 @@ $item-md-forward-icon-color: $item-md-border-color !default; position: absolute; right: 0; bottom: 0; - left: 0; + left: $item-md-padding-left; border-top: 1px solid $item-md-border-color; content: ''; } + + &:first-child:before, + &:last-child:after { + left: 0; + } } ion-header + .item:before { diff --git a/ionic/components/radio/modes/material.scss b/ionic/components/radio/modes/material.scss index 4d389787dd..2a52fd3894 100644 --- a/ionic/components/radio/modes/material.scss +++ b/ionic/components/radio/modes/material.scss @@ -6,7 +6,7 @@ $radio-md-active-color: color(primary) !default; $radio-md-icon-size: 16px !default; $radio-md-border-width: 2px !default; -$radio-md-color-off: $list-border-color !default; +$radio-md-color-off: $item-md-border-color !default; $radio-md-transition-duration: 280ms !default; $radio-md-transition-easing: cubic-bezier(.4, 0, .2, 1) !default; diff --git a/ionic/components/switch/modes/material.scss b/ionic/components/switch/modes/material.scss index a0a274ca7a..fd5ac16660 100644 --- a/ionic/components/switch/modes/material.scss +++ b/ionic/components/switch/modes/material.scss @@ -6,7 +6,7 @@ $switch-md-active-color: color(primary) !default; $switch-md-track-width: 36px !default; $switch-md-track-height: 14px !default; -$switch-md-track-off-bg-color: $list-border-color !default; +$switch-md-track-off-bg-color: $item-md-border-color !default; $switch-md-track-on-bg-color: lighten($switch-md-active-color, 25%) !default; $switch-md-handle-width: 20px !default; diff --git a/ionic/ionic.material.scss b/ionic/ionic.material.scss index 9902616996..b7917c6cc6 100644 --- a/ionic/ionic.material.scss +++ b/ionic/ionic.material.scss @@ -6,10 +6,10 @@ "components/toolbar/modes/material", "components/action-menu/modes/material", "components/button/modes/material", - "components/checkbox/modes/material", "components/item/modes/material", "components/list/modes/material", "components/card/modes/material", + "components/checkbox/modes/material", "components/text-input/modes/material", "components/nav-bar/modes/material", "components/radio/modes/material",