javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(text): added text color for the entire body and added a paragraph variable

Browse Source 
renamed some variables in item and added a variable for item paragraph
color. Fixes #762
This commit is contained in:
Brandy Carney
2015-12-17 12:33:57 -05:00
parent 78813efa3b
commit b005bd1601
7 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ionic/components/app/app.ios.scss
View File

@@ -3,6 +3,14 @@
// iOS App
// --------------------------------------------------
body {
color: $text-ios-color;
}
p {
color: $paragraph-ios-color;
}
a {
color: $link-ios-color;

7
ionic/components/app/app.md.scss
View File

@@ -3,6 +3,13 @@
// Material Design App
// --------------------------------------------------
body {
color: $text-md-color;
}
p {
color: $paragraph-md-color;
}
a {
color: $link-md-color;

8
ionic/components/item/item.ios.scss
View File

@@ -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;
}

15
ionic/components/item/item.md.scss
View File

@@ -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;
}

1
ionic/themes/default.ios.scss
View File

@@ -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;

1
ionic/themes/default.md.scss
View File

@@ -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;

1
ionic/themes/default.scss
View File

@@ -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;