From a34959abf654496f52f5290f460a38022c02eb18 Mon Sep 17 00:00:00 2001 From: Sergey Andrievskiy Date: Thu, 30 May 2019 21:12:37 +0300 Subject: [PATCH 1/4] feat(typography): add list styles --- .../theme/components/list/_list.component.theme.scss | 5 +++++ .../theme/styles/global/typography/_typography.scss | 8 ++++++++ src/framework/theme/styles/themes/_mapping.scss | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/src/framework/theme/components/list/_list.component.theme.scss b/src/framework/theme/components/list/_list.component.theme.scss index 5495c544ad..d51ed4995d 100644 --- a/src/framework/theme/components/list/_list.component.theme.scss +++ b/src/framework/theme/components/list/_list.component.theme.scss @@ -5,6 +5,11 @@ nb-theme(list-item-divider-style) nb-theme(list-item-divider-color); + color: nb-theme(list-item-text-color); + font-family: nb-theme(list-item-font-family); + font-size: nb-theme(list-item-font-size); + font-weight: nb-theme(list-item-font-weight); + line-height: nb-theme(list-item-line-height); padding: nb-theme(list-item-padding); &:first-child { diff --git a/src/framework/theme/styles/global/typography/_typography.scss b/src/framework/theme/styles/global/typography/_typography.scss index bcd59d8d97..2091ded922 100644 --- a/src/framework/theme/styles/global/typography/_typography.scss +++ b/src/framework/theme/styles/global/typography/_typography.scss @@ -62,4 +62,12 @@ } } } + + li { + color: nb-theme(list-item-text-color); + font-family: nb-theme(list-item-font-family); + font-size: nb-theme(list-item-font-size); + font-weight: nb-theme(list-item-font-weight); + line-height: nb-theme(list-item-line-height); + } } diff --git a/src/framework/theme/styles/themes/_mapping.scss b/src/framework/theme/styles/themes/_mapping.scss index 8c24a5e1e1..5c9f98e8af 100644 --- a/src/framework/theme/styles/themes/_mapping.scss +++ b/src/framework/theme/styles/themes/_mapping.scss @@ -1180,6 +1180,11 @@ $eva-mapping: ( list-item-divider-style: divider-style, list-item-divider-width: divider-width, list-item-padding: 1rem, + list-item-text-color: text-basic-color, + list-item-font-family: text-paragraph-font-family, + list-item-font-size: text-paragraph-font-size, + list-item-font-weight: text-paragraph-font-weight, + list-item-line-height: text-paragraph-line-height, calendar-width: 21.875rem, calendar-body-height: 25.625rem, From 77279340928aabaac556d852d8b6c7adbabc6243 Mon Sep 17 00:00:00 2001 From: Sergey Andrievskiy Date: Thu, 30 May 2019 21:14:23 +0300 Subject: [PATCH 2/4] feat(typography): add body styles --- .../theme/styles/global/typography/_typography.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/framework/theme/styles/global/typography/_typography.scss b/src/framework/theme/styles/global/typography/_typography.scss index 2091ded922..d85ece91b8 100644 --- a/src/framework/theme/styles/global/typography/_typography.scss +++ b/src/framework/theme/styles/global/typography/_typography.scss @@ -1,4 +1,12 @@ @mixin nb-typography { + body { + color: nb-theme(text-basic-color); + font-family: nb-theme(text-paragraph-font-family); + font-size: nb-theme(text-paragraph-font-size); + font-weight: nb-theme(text-paragraph-font-weight); + line-height: nb-theme(text-paragraph-line-height); + } + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { color: nb-theme(text-basic-color); From fbf718eef3449afd0cd3e485d207dd7a2e4de215 Mon Sep 17 00:00:00 2001 From: Sergey Andrievskiy Date: Thu, 30 May 2019 21:16:16 +0300 Subject: [PATCH 3/4] feat(paragraph): add body styles --- .../theme/styles/global/typography/_typography.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/framework/theme/styles/global/typography/_typography.scss b/src/framework/theme/styles/global/typography/_typography.scss index d85ece91b8..39126eb1c7 100644 --- a/src/framework/theme/styles/global/typography/_typography.scss +++ b/src/framework/theme/styles/global/typography/_typography.scss @@ -22,6 +22,14 @@ } } + p { + color: nb-theme(text-basic-color); + font-family: nb-theme(text-paragraph-font-family); + font-size: nb-theme(text-paragraph-font-size); + font-weight: nb-theme(text-paragraph-font-weight); + line-height: nb-theme(text-paragraph-line-height); + } + a { color: nb-theme(link-text-color); font-size: inherit; From bf6ef49c3f64766ddd0fab1f7a837ddca5e45467 Mon Sep 17 00:00:00 2001 From: Sergey Andrievskiy Date: Thu, 30 May 2019 22:38:25 +0300 Subject: [PATCH 4/4] docs(list): update theme properties list --- src/framework/theme/components/list/list.component.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/framework/theme/components/list/list.component.ts b/src/framework/theme/components/list/list.component.ts index 76c5796fac..dba57f1e8e 100644 --- a/src/framework/theme/components/list/list.component.ts +++ b/src/framework/theme/components/list/list.component.ts @@ -31,6 +31,11 @@ import { Component, Input, HostBinding } from '@angular/core'; * list-item-divider-style: * list-item-divider-width: * list-item-padding: + * list-item-text-color: + * list-item-font-family: + * list-item-font-size: + * list-item-font-weight: + * list-item-line-height: */ @Component({ selector: 'nb-list',