From 60b4bec10015a1cc6d84597a07ce59aa4549e8c0 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 10 Aug 2017 17:50:17 -0400 Subject: [PATCH] fix(list-header): add proper styles for list header --- .../core/src/components/list-header/list-header.ios.scss | 4 +--- .../core/src/components/list-header/list-header.md.scss | 6 ++---- packages/core/src/components/list-header/list-header.tsx | 5 +++++ .../core/src/components/list-header/list-header.wp.scss | 4 +--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/core/src/components/list-header/list-header.ios.scss b/packages/core/src/components/list-header/list-header.ios.scss index b665830d2d..902fd8900a 100644 --- a/packages/core/src/components/list-header/list-header.ios.scss +++ b/packages/core/src/components/list-header/list-header.ios.scss @@ -5,10 +5,8 @@ // iOS List Header // -------------------------------------------------- -// deprecated -$list-ios-header-padding-left: $item-ios-padding-start !default; /// @prop - Padding start of the header in a list -$list-ios-header-padding-start: $list-ios-header-padding-left !default; +$list-ios-header-padding-start: $item-ios-padding-start !default; /// @prop - Border bottom of the header in a list $list-ios-header-border-bottom: $hairlines-width solid $list-ios-border-color !default; diff --git a/packages/core/src/components/list-header/list-header.md.scss b/packages/core/src/components/list-header/list-header.md.scss index 857936f299..89c20bffec 100644 --- a/packages/core/src/components/list-header/list-header.md.scss +++ b/packages/core/src/components/list-header/list-header.md.scss @@ -1,4 +1,4 @@ -@import "../../themes/ionic.globals.ios"; +@import "../../themes/ionic.globals.md"; @import "./list-header"; // Material Design List Header @@ -7,10 +7,8 @@ /// @prop - Margin bottom of the header in a list $list-md-header-margin-bottom: 13px !default; -// deprecated -$list-md-header-padding-left: $item-md-padding-start !default; /// @prop - Padding start of the header in a list -$list-md-header-padding-start: $list-md-header-padding-left !default; +$list-md-header-padding-start: $item-md-padding-start !default; /// @prop - Minimum height of the header in a list $list-md-header-min-height: 4.5rem !default; diff --git a/packages/core/src/components/list-header/list-header.tsx b/packages/core/src/components/list-header/list-header.tsx index 50890e45bb..463cf72619 100644 --- a/packages/core/src/components/list-header/list-header.tsx +++ b/packages/core/src/components/list-header/list-header.tsx @@ -3,6 +3,11 @@ import { Component } from '@stencil/core'; @Component({ tag: 'ion-list-header', + styleUrls: { + ios: 'list-header.ios.scss', + md: 'list-header.md.scss', + wp: 'list-header.wp.scss' + }, host: { theme: 'list-header' } diff --git a/packages/core/src/components/list-header/list-header.wp.scss b/packages/core/src/components/list-header/list-header.wp.scss index 0e45f28a2f..71fefb7e4c 100644 --- a/packages/core/src/components/list-header/list-header.wp.scss +++ b/packages/core/src/components/list-header/list-header.wp.scss @@ -4,10 +4,8 @@ // Windows List Header // -------------------------------------------------- -// deprecated -$list-wp-header-padding-left: $item-wp-padding-start !default; /// @prop - Padding start of the header in a list -$list-wp-header-padding-start: $list-wp-header-padding-left !default; +$list-wp-header-padding-start: $item-wp-padding-start !default; /// @prop - Border bottom of the header in a list $list-wp-header-border-bottom: 1px solid $list-wp-border-color !default;