From b005bd1601219ae8dd88f549aef1abe0e78db0b9 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 17 Dec 2015 12:33:57 -0500 Subject: [PATCH] fix(text): added text color for the entire body and added a paragraph variable renamed some variables in item and added a variable for item paragraph color. Fixes #762 --- ionic/components/app/app.ios.scss | 8 ++++++++ ionic/components/app/app.md.scss | 7 +++++++ ionic/components/item/item.ios.scss | 8 +++++--- ionic/components/item/item.md.scss | 15 ++++++++------- ionic/themes/default.ios.scss | 1 + ionic/themes/default.md.scss | 1 + ionic/themes/default.scss | 1 + 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ionic/components/app/app.ios.scss b/ionic/components/app/app.ios.scss index ada8078e94..1d47fd37e1 100644 --- a/ionic/components/app/app.ios.scss +++ b/ionic/components/app/app.ios.scss @@ -3,6 +3,14 @@ // iOS App // -------------------------------------------------- +body { + color: $text-ios-color; +} + +p { + color: $paragraph-ios-color; +} + a { color: $link-ios-color; diff --git a/ionic/components/app/app.md.scss b/ionic/components/app/app.md.scss index 77d9fed5d0..4bd7ead9c3 100644 --- a/ionic/components/app/app.md.scss +++ b/ionic/components/app/app.md.scss @@ -3,6 +3,13 @@ // Material Design App // -------------------------------------------------- +body { + color: $text-md-color; +} + +p { + color: $paragraph-md-color; +} a { color: $link-md-color; diff --git a/ionic/components/item/item.ios.scss b/ionic/components/item/item.ios.scss index b8556574fe..42bc43110d 100644 --- a/ionic/components/item/item.ios.scss +++ b/ionic/components/item/item.ios.scss @@ -4,7 +4,9 @@ // iOS Item // -------------------------------------------------- -$item-ios-font-size: 1.6rem !default; +$item-ios-body-text-font-size: 1.6rem !default; +$item-ios-paragraph-text-color: #666 !default; + $item-ios-avatar-size: 3.6rem !default; $item-ios-thumbnail-size: 5.6rem !default; $item-ios-note-color: darken($list-ios-border-color, 10%) !default; @@ -22,7 +24,7 @@ $item-ios-sliding-content-bg: $list-ios-background-color !default; .item { padding-left: $item-ios-padding-left; - font-size: $item-ios-font-size; + font-size: $item-ios-body-text-font-size; border-radius: 0; color: $list-ios-text-color; background-color: $list-ios-background-color; @@ -52,7 +54,7 @@ $item-ios-sliding-content-bg: $list-ios-background-color !default; p { line-height: normal; - color: #666; + color: $item-ios-paragraph-text-color; font-size: 1.2rem; margin: 0 0 2px; } diff --git a/ionic/components/item/item.md.scss b/ionic/components/item/item.md.scss index b518b0a50f..5a288d32e5 100644 --- a/ionic/components/item/item.md.scss +++ b/ionic/components/item/item.md.scss @@ -4,13 +4,14 @@ // Material Design Item // -------------------------------------------------- -$item-md-body-text-font-size: 1.4rem !default; -$item-md-body-text-line-height: 1.5 !default; +$item-md-body-text-font-size: 1.4rem !default; +$item-md-body-text-line-height: 1.5 !default; +$item-md-paragraph-text-color: #666 !default; -$item-md-font-size: 1.6rem !default; -$item-md-avatar-size: 4rem !default; -$item-md-thumbnail-size: 8rem !default; -$item-md-note-color: darken($list-md-border-color, 10%) !default; +$item-md-font-size: 1.6rem !default; +$item-md-avatar-size: 4rem !default; +$item-md-thumbnail-size: 8rem !default; +$item-md-note-color: darken($list-md-border-color, 10%) !default; $item-md-divider-bg: #fff !default; $item-md-divider-color: #222 !default; @@ -56,7 +57,7 @@ $item-md-sliding-content-bg: $list-md-background-color !default; p { line-height: normal; - color: #666; + color: $item-md-paragraph-text-color; font-size: 1.4rem; margin: 0 0 2px; } diff --git a/ionic/themes/default.ios.scss b/ionic/themes/default.ios.scss index aa79630996..c85244041d 100644 --- a/ionic/themes/default.ios.scss +++ b/ionic/themes/default.ios.scss @@ -7,6 +7,7 @@ $colors-ios: copy-colors($colors) !default; $text-ios-color: $text-color !default; +$paragraph-ios-color: $paragraph-color !default; $link-ios-color: map-get($colors-ios, primary) !default; $background-ios-color: $background-color !default; $subdued-text-ios-color: $subdued-text-color !default; diff --git a/ionic/themes/default.md.scss b/ionic/themes/default.md.scss index b6bb7dd851..bf009b62c2 100644 --- a/ionic/themes/default.md.scss +++ b/ionic/themes/default.md.scss @@ -7,6 +7,7 @@ $colors-md: copy-colors($colors) !default; $text-md-color: $text-color !default; +$paragraph-md-color: $paragraph-color !default; $link-md-color: map-get($colors-md, primary) !default; $background-md-color: $background-color !default; $subdued-text-md-color: $subdued-text-color !default; diff --git a/ionic/themes/default.scss b/ionic/themes/default.scss index f2ce893d64..8b58770a76 100644 --- a/ionic/themes/default.scss +++ b/ionic/themes/default.scss @@ -14,6 +14,7 @@ $colors: ( $text-color: #000 !default; +$paragraph-color: $text-color !default; $link-color: map-get($colors, primary) !default; $background-color: #fff !default; $subdued-text-color: #666 !default;