From 124aaff389f0a086c8d353ce40b1d01a3d5761ba Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 8 Feb 2016 17:01:29 +0100 Subject: [PATCH] add first commit --- src/fonts/cartoIcon.eot | Bin 18856 -> 18856 bytes src/fonts/cartoIcon.ttf | Bin 18684 -> 18684 bytes src/fonts/cartoIcon.woff | Bin 11836 -> 11836 bytes src/scss/cdb-components/typography.scss | 4 +++- src/scss/cdb-utilities/defaults.css.scss | 4 ++++ src/scss/cdb-utilities/helpers.scss | 12 ++++++++++++ src/scss/cdb-variables/_colors.scss | 1 + 7 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 0b83194ca36ab0569001ad8dc7307df38619af0b..bed146d60ed603d2c89833c2745248449cdfbf44 100644 GIT binary patch delta 55 zcmZ26nQ_Hr#tAme_f0$}+OK0?t+Qj|hpEz@Cimm{ZN4&aGyY-#f=l;GpTp?Q3m7>( E0B30xq5uE@ delta 55 zcmZ26nQ_Hr#tAme+OuOP+OK0?@N?3{4^yRMXKTmv+k9o( E0AHpQY5)KL diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 4caa8b4d390117aeed4eb1655de4da216edbf5a4..b2a25acc7f4c42df0161ecb44568a43fcf8fdc90 100644 GIT binary patch delta 47 wcmew}k@3$&#tDwht95ovbeSscX>vcF-{va=H{&k`Ah>j|^f`>)_=Up*0Ld^D6951J delta 47 wcmew}k@3$&#tDwh3w}Kyc}1ObCqL_=Up*0L?iP6aWAK diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index c80206041e67c10db007e2385d40ab6ab3b63509..7a1125b31a23762222c63368070fe9aec38e71e9 100644 GIT binary patch delta 67 zcmV-J0KEUaT)bS6a|ts5001`ot1P&&e6}Vj9un5^{5D@1xEX%|MHnvKD}4^5-<1FV Z&K1G<2gv1MU;>E(0EZ6`3bR`$;Re7v8}0xA delta 67 zcmV-J0KEUaT)bS6a|tp4001`op!t%qe6}VjF?H?n{5D@1xEX%|MHnvKj0u6!Z_59F Z=Zawb1LSfrFo8q?h|3Oc0JB>s;RgNL9k~Di 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;