diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 0b83194..bed146d 100644 Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 4caa8b4..b2a25ac 100644 Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index c802060..7a1125b 100644 Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 67b7f34..10ee568 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -10,7 +10,9 @@
Open Sans 16/22 Regular
Open Sans 12/16 Semibold
Open Sans 12/16 Semibold Uppercase
-Open Sans 12/16 Regular
+Open Sans 12/16 Regular
+Open Sans 12/16 Regular
+Open Sans 12/16 Regular
Open Sans 10/14 Semibold
Open Sans 10/14 Regular
``` diff --git a/src/scss/cdb-utilities/defaults.css.scss b/src/scss/cdb-utilities/defaults.css.scss index c7998f1..6996513 100644 --- a/src/scss/cdb-utilities/defaults.css.scss +++ b/src/scss/cdb-utilities/defaults.css.scss @@ -3,6 +3,10 @@ @import '../cdb-variables/colors'; +body { + color: $cTypoMain; +} + a { color: $cBlue; text-decoration: none; diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 1cb8a7b..01b7a79 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -2,6 +2,7 @@ // ---------------------------------------------- @import './mixins'; +@import '../cdb-variables/colors'; .u-tSpace { margin-top: 4px; @@ -36,6 +37,17 @@ .u-bSpace--m { margin-bottom: 8px; } +.u-textSecondary { + color: $cTypo2; +} +.u-textSubtitle { + color: $cTypo3; +} +.u-textDisabled { + color: $cTypo4; +} + + .u-iBlock { @include inline-block(); diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index fc0bc81..bd1a9e4 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -18,6 +18,7 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography +$cTypoMain: #2E3C43; $cTypo2: #636D72; $cTypo3: #979EA1; $cTypo4: #CBCED0;