From de28bd3b79b1dd607fec9fa35a71b52caf2b9105 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 18 Mar 2020 15:43:36 -0400 Subject: [PATCH] fix(list): show bottom border on last item in a list followed by a list (#20798) --- core/src/components/list/list.ios.scss | 2 +- core/src/components/list/list.ios.vars.scss | 8 +- .../src/components/list/test/icons/index.html | 134 +++++++++--------- 3 files changed, 75 insertions(+), 69 deletions(-) diff --git a/core/src/components/list/list.ios.scss b/core/src/components/list/list.ios.scss index 23006439d6..b3a88c8bee 100644 --- a/core/src/components/list/list.ios.scss +++ b/core/src/components/list/list.ios.scss @@ -5,7 +5,7 @@ // -------------------------------------------------- .list-ios { - @include margin(-1px, $list-ios-margin-end, $list-ios-margin-bottom, $list-ios-margin-start); + @include margin($list-ios-margin-top, $list-ios-margin-end, $list-ios-margin-bottom, $list-ios-margin-start); background: $item-ios-background; } diff --git a/core/src/components/list/list.ios.vars.scss b/core/src/components/list/list.ios.vars.scss index 6aabd7ad48..161dec71af 100644 --- a/core/src/components/list/list.ios.vars.scss +++ b/core/src/components/list/list.ios.vars.scss @@ -5,16 +5,16 @@ // -------------------------------------------------- /// @prop - Margin top of the list -$list-ios-margin-top: 10px !default; +$list-ios-margin-top: null !default; /// @prop - Margin end of the list -$list-ios-margin-end: 0 !default; +$list-ios-margin-end: null !default; /// @prop - Margin bottom of the list -$list-ios-margin-bottom: 0 !default; +$list-ios-margin-bottom: null !default; /// @prop - Margin start of the list -$list-ios-margin-start: 0 !default; +$list-ios-margin-start: null !default; /// @prop - Border bottom of the item in a list $list-ios-item-border-bottom-width: $item-ios-border-bottom-width !default; diff --git a/core/src/components/list/test/icons/index.html b/core/src/components/list/test/icons/index.html index 761a5f1868..81f791e64c 100644 --- a/core/src/components/list/test/icons/index.html +++ b/core/src/components/list/test/icons/index.html @@ -4,21 +4,23 @@ List - Icons - - + + - + + - - Topics + + Trip - + @@ -27,83 +29,87 @@ - - - + + + + Categories + + + + Attractions - - + + Dining - - + + Education - - - - Health - - - - - - Family - - - - - - Office - - - - - - Promotions - - - - - - Radio - - - - - - Food - - - - - - Sports - - - - + + Travel + + + + + Information + + + + + + Attendees + + + 1 + 2 + 3 + + + + + + Round-trip + + + + + + + + + Contact + + + + + + Name + + + + + + + Phone Number + + + + - -