From 124aaff389f0a086c8d353ce40b1d01a3d5761ba Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 8 Feb 2016 17:01:29 +0100 Subject: [PATCH 1/7] 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; From f38377fa9eb98802cca82226daf5147fe4835885 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Mon, 8 Feb 2016 17:48:03 +0100 Subject: [PATCH 2/7] use helpers --- src/scss/cdb-components/avatars.scss | 3 +-- src/scss/cdb-components/headers.scss | 8 ++------ src/scss/cdb-components/menu.scss | 5 ++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss index 62a6fe4..c78be1f 100644 --- a/src/scss/cdb-components/avatars.scss +++ b/src/scss/cdb-components/avatars.scss @@ -16,7 +16,7 @@ User Name
  • - +
    • ``` @@ -44,7 +44,6 @@ border-left: 2px solid $cWhite; border-radius: 50px; background: $cSecondaryLine; - color: $cTypo2; } .CDB-AvatarList-itemMedia { diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index 02ca1b2..17980ac 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -43,7 +43,7 @@
  • -

    Published 8 days ago

    +

    Published 8 days ago

    • @@ -108,7 +108,7 @@ -

    Positron by CartoDB

    +

    Positron by CartoDB


    @@ -159,10 +159,6 @@ } } -.CDB-HeaderInfo-Text { - color: $cTypo3; -} - .CDB-HeaderInfo-Inner { @include flex(1); } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index bcf7e13..3880e39 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP @@ -125,7 +125,6 @@ .CDB-NavSubmenu-Status { margin-left: 2px; - color: $cTypo4; } .CDB-Navmenu.is-dark { From 7aec38fb559626c9e25436c14301f01d01e3810c Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 16:43:54 +0100 Subject: [PATCH 3/7] fix CR --- src/scss/cdb-components/headers.scss | 8 ++++---- src/scss/cdb-components/menu.scss | 4 ++-- src/scss/cdb-components/typography.scss | 4 ++-- src/scss/cdb-utilities/helpers.scss | 12 ++++++++++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index f781327..a449eb5 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -43,7 +43,7 @@
  • -

    Published 8 days ago

    +

    Published 8 days ago

    • @@ -111,7 +111,7 @@ -

    Positron by CartoDB

    +

    Positron by CartoDB

    @@ -155,8 +155,8 @@ -

    Histogram

    -

    Distribution of a numeric variable in a range

    +

    Histogram

    +

    Distribution of a numeric variable in a range

    diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 3880e39..c0c8a04 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 291c0b0..b0ff817 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -11,8 +11,8 @@

    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 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 01b7a79..aa9c3ec 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -37,13 +37,21 @@ .u-bSpace--m { margin-bottom: 8px; } + +// Colors +// Main Text Color is default color +// ---------------------------------------------- + +.u-mainTextColor { + color: $cMainDark; +} .u-textSecondary { color: $cTypo2; } -.u-textSubtitle { +.u-aux1TextColor { color: $cTypo3; } -.u-textDisabled { +.u-aux2TextColor { color: $cTypo4; } From cf97094b8c224e6266bfa193652e7afe8e1f5e8a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 16:54:05 +0100 Subject: [PATCH 4/7] fix pr --- 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/headers.scss | 8 ++++---- src/scss/cdb-components/menu.scss | 4 ++-- src/scss/cdb-components/typography.scss | 4 ++-- src/scss/cdb-utilities/helpers.scss | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index 3049b66ca2785f0a99ae49c4cd0f0af8a2b7b327..dcdd55ab0be4f13acd70d48c51d384ce9888cfe3 100644 GIT binary patch delta 54 zcmZ26nQ_Hr#tAme;_sX%+OKE2AT#m9RB7jT;_>`8Um3U=e=z{TrTfQc!syKl7&$xu DL^KrP delta 54 zcmZ26nQ_Hr#tAme%bi>%+OKC?dS&8=snRY^%j5ZNzA|t#{$c=vOZPXG!syKl7&$xu DOXC#A diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 91b115ff9ccf30adb68b3e51f647bbd8446bae74..3fed9de7d31b9b03ed5b3736774c00e57e43f6cc 100644 GIT binary patch delta 46 vcmew}k@3$&#tBYL7i1>7OqF(iCmzpl^Ob>{@fQOST)KaJCXC+rg~I~?tqu}q delta 46 vcmew}k@3$&#tBYLORr3HnJVq#v^<{Q<|_j?<1YpvxO9J0DU9Cug~I~?xY814 diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index d2ad4809e2e495f620c097547fa3305fa8ea897f..bc80aec19be85f7911df131db1f873631099c4de 100644 GIT binary patch delta 60 zcmV-C0K@;hT)bS6dIHcKv3#~BDNYxQ! delta 60 zcmV-C0K@;hT)bS6dIF`?v3#~BDb8xl@%%Pl8MqmL0Yw-t-QQFSqu-SO|IQV`_y@@4 SU|<4?0swYY4s)|xC*cN{@*I@_ diff --git a/src/scss/cdb-components/headers.scss b/src/scss/cdb-components/headers.scss index a449eb5..8c046da 100644 --- a/src/scss/cdb-components/headers.scss +++ b/src/scss/cdb-components/headers.scss @@ -43,7 +43,7 @@
  • -

    Published 8 days ago

    +

    Published 8 days ago

    • @@ -111,7 +111,7 @@ -

    Positron by CartoDB

    +

    Positron by CartoDB

    @@ -155,8 +155,8 @@ -

    Histogram

    -

    Distribution of a numeric variable in a range

    +

    Histogram

    +

    Distribution of a numeric variable in a range

    diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index c0c8a04..c2bd83d 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -18,10 +18,10 @@ POP-UP diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index b0ff817..810cf0c 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -11,8 +11,8 @@

    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 12/16 Regular

    Open Sans 10/14 Semibold

    Open Sans 10/14 Regular

    ``` diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index aa9c3ec..9a201d8 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -48,10 +48,10 @@ .u-textSecondary { color: $cTypo2; } -.u-aux1TextColor { +.u-altTextColor { color: $cTypo3; } -.u-aux2TextColor { +.u-hintTextColor { color: $cTypo4; } From 45c90f9cd9ef799744ce2c3b3186bc83ff18263e Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:17:14 +0100 Subject: [PATCH 5/7] change vars --- src/scss/cdb-components/avatars.scss | 2 +- src/scss/cdb-components/colors.scss | 6 +++--- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 6 +++--- src/scss/cdb-components/shapes/add.scss | 8 ++++---- src/scss/cdb-components/shapes/arrow.scss | 6 +++--- src/scss/cdb-components/shapes/check-circle.scss | 6 +++--- src/scss/cdb-components/shapes/close.scss | 4 ++-- src/scss/cdb-components/shapes/dash.scss | 2 +- src/scss/cdb-components/shapes/dataset.scss | 8 ++++---- src/scss/cdb-components/shapes/error-circle.scss | 2 +- src/scss/cdb-components/shapes/hamburguer.scss | 2 +- src/scss/cdb-components/shapes/magnify.scss | 4 ++-- src/scss/cdb-components/shapes/move.scss | 4 ++-- src/scss/cdb-components/shapes/threePoints.scss | 2 +- src/scss/cdb-components/shapes/toogle-arrow.scss | 4 ++-- src/scss/cdb-components/typography.scss | 2 +- src/scss/cdb-utilities/helpers.scss | 4 ++-- src/scss/cdb-variables/_colors.scss | 10 +++++----- 20 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/scss/cdb-components/avatars.scss b/src/scss/cdb-components/avatars.scss index c78be1f..772a210 100644 --- a/src/scss/cdb-components/avatars.scss +++ b/src/scss/cdb-components/avatars.scss @@ -16,7 +16,7 @@ User Name
  • - +
    • ``` diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss index 1fac96d..f5d73d4 100644 --- a/src/scss/cdb-components/colors.scss +++ b/src/scss/cdb-components/colors.scss @@ -18,9 +18,9 @@ @import '../cdb-variables/colors'; .box { + display: inline-block; width: 120px; height: 64px; - display: inline-block; margin: 0 24px 24px 0; } @@ -28,15 +28,15 @@ background: $cBlue; } .Color-White { + border: 1px solid #E5E5E5; background: $cWhite; - border: 1px solid #e5e5e5; } .Color-Dark { background: $cBlack; } .Color-MainDark { - background: $cMainDark; + background: $cMainBgColor; } .Color-SecondaryDark { background: $cSecondaryDark; diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index e6dd65b..81c3670 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -49,7 +49,7 @@ } &:checked + .CDB-ToggleFace { - background: $cMainDark; + background: $cMainBgColor; &::before { right: 2px; diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index 07e066b..ae9d543 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -105,12 +105,12 @@ This is the generic loader for widgets, maps, components, ... background: $cWhite; } &.is-grey { - background: linear-gradient(to right, $cMainDark 10%, rgba($cWhite, 0) 42%); + background: linear-gradient(to right, $cMainBgColor 10%, rgba($cWhite, 0) 42%); &::before { background: $cTypo2; } &::after { - background: $cMainDark; + background: $cMainBgColor; } } } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index c2bd83d..7327574 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -97,8 +97,8 @@ } .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { - border-bottom: 1px solid $cMainDark; - color: $cMainDark; + border-bottom: 1px solid $cMainBgColor; + color: $cMainBgColor; } .CDB-NavSubmenu { @@ -119,7 +119,7 @@ .CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-Link { border-bottom: 1px solid $cTypo3; - color: $cMainDark; + color: $cMainBgColor; } } diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index 570d5b4..a172077 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -65,7 +65,7 @@ Description bottom: 7px; left: 0; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -76,7 +76,7 @@ Description bottom: 0; left: 7px; width: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } @@ -90,7 +90,7 @@ Description bottom: 7px; left: 4px; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -101,7 +101,7 @@ Description bottom: 3px; left: 8px; width: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index cb596d0..172fcda 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -22,7 +22,7 @@ Description position: relative; width: 1px; height: 8px; - background: $cMainDark; + background: $cMainBgColor; &::before { display: block; @@ -32,7 +32,7 @@ Description width: 5px; height: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -44,7 +44,7 @@ Description width: 5px; height: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &.is-up { diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index f63cb76..4d1ac0c 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 14px; height: 14px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; &.is-small { @@ -86,7 +86,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -94,7 +94,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index 40b26f6..f25e7bf 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -55,7 +55,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -63,7 +63,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/dash.scss index 409bd20..361a6b8 100644 --- a/src/scss/cdb-components/shapes/dash.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -56,7 +56,7 @@ Description bottom: 7px; left: 2px; height: 1px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 494918d..8612383 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -95,7 +95,7 @@ Description width: 9px; height: 9px; margin-left: -10px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; background: $cWhite; @@ -132,15 +132,15 @@ Description .CDB-Shape-Dataset.is-white { .CDB-Shape-DatasetItem { border: 1px solid $cHoverLine; - background: $cMainDark; + background: $cMainBgColor; &:first-child { - box-shadow: 3px 0 $cMainDark; + box-shadow: 3px 0 $cMainBgColor; } } } .CDB-Shape-Dataset.is-white.is-small { .CDB-Shape-DatasetItem:first-child { - box-shadow: 2px 0 $cMainDark; + box-shadow: 2px 0 $cMainBgColor; } } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index eebeb92..ee1a4bb 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 13px; height: 13px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; &.is-small { diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss index 7b8ceff..4bd02e8 100644 --- a/src/scss/cdb-components/shapes/hamburguer.scss +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -43,7 +43,7 @@ Description .CDB-Shape-hamburguerItem { height: $baseSize / 4; margin-bottom: $baseSize / 4; - background: $cMainDark; + background: $cMainBgColor; &:last-child { margin-bottom: 0; diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index 7f4f2f0..9bb2128 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -58,7 +58,7 @@ Description left: 0; width: 11px; height: 11px; - border: 1px solid $cMainDark; + border: 1px solid $cMainBgColor; border-radius: 50%; content: ''; } @@ -71,7 +71,7 @@ Description width: 1px; height: 7px; transform: rotate(314deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index e1f423b..d5ea9e1 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -101,7 +101,7 @@ Description display: inline-block; width: 3px; height: 3px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } @@ -110,7 +110,7 @@ Description width: 3px; height: 3px; margin-left: 2px; - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 48038e3..4757bb8 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -77,7 +77,7 @@ Description width: 2px; height: 2px; margin-bottom: 5px; - background: $cMainDark; + background: $cMainBgColor; &:last-child { margin-bottom: 0; } diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index 86f302a..d5b5fde 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -97,7 +97,7 @@ Description width: 10px; height: 1px; transform: rotate(-45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } &::after { @@ -108,7 +108,7 @@ Description width: 10px; height: 1px; transform: rotate(45deg); - background: $cMainDark; + background: $cMainBgColor; content: ''; } } diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss index 810cf0c..74c0127 100644 --- a/src/scss/cdb-components/typography.scss +++ b/src/scss/cdb-components/typography.scss @@ -10,7 +10,7 @@

    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

    diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index 9a201d8..b21de94 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -43,9 +43,9 @@ // ---------------------------------------------- .u-mainTextColor { - color: $cMainDark; + color: $cMainTextColor; } -.u-textSecondary { +.u-secondaryTextColor { color: $cTypo2; } .u-altTextColor { diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index bd1a9e4..fb8f9ee 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -5,7 +5,7 @@ $cBlue: #3AA9E3; $cBlack: #000; $cWhite: #FFF; -$cMainDark: #2E3C43; +$cMainBgColor: #2E3C43; //Structure $cSecondaryDark: #282C2F; @@ -18,10 +18,10 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography -$cTypoMain: #2E3C43; -$cTypo2: #636D72; -$cTypo3: #979EA1; -$cTypo4: #CBCED0; +$cMainTextColor: #2E3C43; +$cSecondaryTextColor: #636D72; +$cAltTextColor: #979EA1; +$cHintTextColor: #CBCED0; //Others $cHighlight: #9DE0AD; From 1da800ecef7c8793f370ad58a5bf29a1b9d8209a Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:25:28 +0100 Subject: [PATCH 6/7] fix vars --- src/scss/cdb-components/colors.scss | 2 +- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 6 +++--- src/scss/cdb-components/shapes/add.scss | 8 ++++---- src/scss/cdb-components/shapes/arrow.scss | 6 +++--- src/scss/cdb-components/shapes/check-circle.scss | 6 +++--- src/scss/cdb-components/shapes/close.scss | 4 ++-- src/scss/cdb-components/shapes/dash.scss | 2 +- src/scss/cdb-components/shapes/dataset.scss | 8 ++++---- src/scss/cdb-components/shapes/error-circle.scss | 2 +- src/scss/cdb-components/shapes/hamburguer.scss | 2 +- src/scss/cdb-components/shapes/magnify.scss | 4 ++-- src/scss/cdb-components/shapes/move.scss | 4 ++-- src/scss/cdb-components/shapes/threePoints.scss | 2 +- src/scss/cdb-components/shapes/toogle-arrow.scss | 4 ++-- src/scss/cdb-utilities/helpers.scss | 2 +- src/scss/cdb-variables/_colors.scss | 10 +++++----- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/scss/cdb-components/colors.scss b/src/scss/cdb-components/colors.scss index f5d73d4..555cb3a 100644 --- a/src/scss/cdb-components/colors.scss +++ b/src/scss/cdb-components/colors.scss @@ -36,7 +36,7 @@ } .Color-MainDark { - background: $cMainBgColor; + background: $cMainBg; } .Color-SecondaryDark { background: $cSecondaryDark; diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss index 81c3670..b37f458 100644 --- a/src/scss/cdb-components/forms/toggle.scss +++ b/src/scss/cdb-components/forms/toggle.scss @@ -49,7 +49,7 @@ } &:checked + .CDB-ToggleFace { - background: $cMainBgColor; + background: $cMainBg; &::before { right: 2px; diff --git a/src/scss/cdb-components/loader.scss b/src/scss/cdb-components/loader.scss index ae9d543..44403cc 100644 --- a/src/scss/cdb-components/loader.scss +++ b/src/scss/cdb-components/loader.scss @@ -105,12 +105,12 @@ This is the generic loader for widgets, maps, components, ... background: $cWhite; } &.is-grey { - background: linear-gradient(to right, $cMainBgColor 10%, rgba($cWhite, 0) 42%); + background: linear-gradient(to right, $cMainBg 10%, rgba($cWhite, 0) 42%); &::before { background: $cTypo2; } &::after { - background: $cMainBgColor; + background: $cMainBg; } } } diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss index 7327574..0ab42f8 100644 --- a/src/scss/cdb-components/menu.scss +++ b/src/scss/cdb-components/menu.scss @@ -97,8 +97,8 @@ } .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { - border-bottom: 1px solid $cMainBgColor; - color: $cMainBgColor; + border-bottom: 1px solid $cMainBg; + color: $cMainBg; } .CDB-NavSubmenu { @@ -119,7 +119,7 @@ .CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-Link { border-bottom: 1px solid $cTypo3; - color: $cMainBgColor; + color: $cMainBg; } } diff --git a/src/scss/cdb-components/shapes/add.scss b/src/scss/cdb-components/shapes/add.scss index a172077..a6b78ec 100644 --- a/src/scss/cdb-components/shapes/add.scss +++ b/src/scss/cdb-components/shapes/add.scss @@ -65,7 +65,7 @@ Description bottom: 7px; left: 0; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -76,7 +76,7 @@ Description bottom: 0; left: 7px; width: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } @@ -90,7 +90,7 @@ Description bottom: 7px; left: 4px; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -101,7 +101,7 @@ Description bottom: 3px; left: 8px; width: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/arrow.scss b/src/scss/cdb-components/shapes/arrow.scss index 172fcda..295cd40 100644 --- a/src/scss/cdb-components/shapes/arrow.scss +++ b/src/scss/cdb-components/shapes/arrow.scss @@ -22,7 +22,7 @@ Description position: relative; width: 1px; height: 8px; - background: $cMainBgColor; + background: $cMainBg; &::before { display: block; @@ -32,7 +32,7 @@ Description width: 5px; height: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -44,7 +44,7 @@ Description width: 5px; height: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &.is-up { diff --git a/src/scss/cdb-components/shapes/check-circle.scss b/src/scss/cdb-components/shapes/check-circle.scss index 4d1ac0c..cf2b1f1 100644 --- a/src/scss/cdb-components/shapes/check-circle.scss +++ b/src/scss/cdb-components/shapes/check-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 14px; height: 14px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; &.is-small { @@ -86,7 +86,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -94,7 +94,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } diff --git a/src/scss/cdb-components/shapes/close.scss b/src/scss/cdb-components/shapes/close.scss index f25e7bf..473f7dc 100644 --- a/src/scss/cdb-components/shapes/close.scss +++ b/src/scss/cdb-components/shapes/close.scss @@ -55,7 +55,7 @@ Description position: absolute; width: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -63,7 +63,7 @@ Description position: absolute; width: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } diff --git a/src/scss/cdb-components/shapes/dash.scss b/src/scss/cdb-components/shapes/dash.scss index 361a6b8..8c3bdeb 100644 --- a/src/scss/cdb-components/shapes/dash.scss +++ b/src/scss/cdb-components/shapes/dash.scss @@ -56,7 +56,7 @@ Description bottom: 7px; left: 2px; height: 1px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/dataset.scss b/src/scss/cdb-components/shapes/dataset.scss index 8612383..0639597 100644 --- a/src/scss/cdb-components/shapes/dataset.scss +++ b/src/scss/cdb-components/shapes/dataset.scss @@ -95,7 +95,7 @@ Description width: 9px; height: 9px; margin-left: -10px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; background: $cWhite; @@ -132,15 +132,15 @@ Description .CDB-Shape-Dataset.is-white { .CDB-Shape-DatasetItem { border: 1px solid $cHoverLine; - background: $cMainBgColor; + background: $cMainBg; &:first-child { - box-shadow: 3px 0 $cMainBgColor; + box-shadow: 3px 0 $cMainBg; } } } .CDB-Shape-Dataset.is-white.is-small { .CDB-Shape-DatasetItem:first-child { - box-shadow: 2px 0 $cMainBgColor; + box-shadow: 2px 0 $cMainBg; } } diff --git a/src/scss/cdb-components/shapes/error-circle.scss b/src/scss/cdb-components/shapes/error-circle.scss index ee1a4bb..5ed5ffc 100644 --- a/src/scss/cdb-components/shapes/error-circle.scss +++ b/src/scss/cdb-components/shapes/error-circle.scss @@ -60,7 +60,7 @@ Description .CDB-Shape-CircleItem { width: 13px; height: 13px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; &.is-small { diff --git a/src/scss/cdb-components/shapes/hamburguer.scss b/src/scss/cdb-components/shapes/hamburguer.scss index 4bd02e8..d5d2bc4 100644 --- a/src/scss/cdb-components/shapes/hamburguer.scss +++ b/src/scss/cdb-components/shapes/hamburguer.scss @@ -43,7 +43,7 @@ Description .CDB-Shape-hamburguerItem { height: $baseSize / 4; margin-bottom: $baseSize / 4; - background: $cMainBgColor; + background: $cMainBg; &:last-child { margin-bottom: 0; diff --git a/src/scss/cdb-components/shapes/magnify.scss b/src/scss/cdb-components/shapes/magnify.scss index 9bb2128..bec21d4 100644 --- a/src/scss/cdb-components/shapes/magnify.scss +++ b/src/scss/cdb-components/shapes/magnify.scss @@ -58,7 +58,7 @@ Description left: 0; width: 11px; height: 11px; - border: 1px solid $cMainBgColor; + border: 1px solid $cMainBg; border-radius: 50%; content: ''; } @@ -71,7 +71,7 @@ Description width: 1px; height: 7px; transform: rotate(314deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/move.scss b/src/scss/cdb-components/shapes/move.scss index d5ea9e1..db5a45f 100644 --- a/src/scss/cdb-components/shapes/move.scss +++ b/src/scss/cdb-components/shapes/move.scss @@ -101,7 +101,7 @@ Description display: inline-block; width: 3px; height: 3px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } @@ -110,7 +110,7 @@ Description width: 3px; height: 3px; margin-left: 2px; - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-components/shapes/threePoints.scss b/src/scss/cdb-components/shapes/threePoints.scss index 4757bb8..a184921 100644 --- a/src/scss/cdb-components/shapes/threePoints.scss +++ b/src/scss/cdb-components/shapes/threePoints.scss @@ -77,7 +77,7 @@ Description width: 2px; height: 2px; margin-bottom: 5px; - background: $cMainBgColor; + background: $cMainBg; &:last-child { margin-bottom: 0; } diff --git a/src/scss/cdb-components/shapes/toogle-arrow.scss b/src/scss/cdb-components/shapes/toogle-arrow.scss index d5b5fde..90381da 100644 --- a/src/scss/cdb-components/shapes/toogle-arrow.scss +++ b/src/scss/cdb-components/shapes/toogle-arrow.scss @@ -97,7 +97,7 @@ Description width: 10px; height: 1px; transform: rotate(-45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } &::after { @@ -108,7 +108,7 @@ Description width: 10px; height: 1px; transform: rotate(45deg); - background: $cMainBgColor; + background: $cMainBg; content: ''; } } diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss index b21de94..4a0d90c 100644 --- a/src/scss/cdb-utilities/helpers.scss +++ b/src/scss/cdb-utilities/helpers.scss @@ -43,7 +43,7 @@ // ---------------------------------------------- .u-mainTextColor { - color: $cMainTextColor; + color: $cMainText; } .u-secondaryTextColor { color: $cTypo2; diff --git a/src/scss/cdb-variables/_colors.scss b/src/scss/cdb-variables/_colors.scss index fb8f9ee..bc31a89 100644 --- a/src/scss/cdb-variables/_colors.scss +++ b/src/scss/cdb-variables/_colors.scss @@ -5,7 +5,7 @@ $cBlue: #3AA9E3; $cBlack: #000; $cWhite: #FFF; -$cMainBgColor: #2E3C43; +$cMainBg: #2E3C43; //Structure $cSecondaryDark: #282C2F; @@ -18,10 +18,10 @@ $cMainLine: #DDD; $cSecondaryLine: #EEE; //Typography -$cMainTextColor: #2E3C43; -$cSecondaryTextColor: #636D72; -$cAltTextColor: #979EA1; -$cHintTextColor: #CBCED0; +$cMainText: #2E3C43; +$cSecondaryText: #636D72; +$cAltText: #979EA1; +$cHintText: #CBCED0; //Others $cHighlight: #9DE0AD; From 7eec29696335caa943cb6ded7307c1f22309dc97 Mon Sep 17 00:00:00 2001 From: piensaenpixel Date: Tue, 9 Feb 2016 17:48:57 +0100 Subject: [PATCH 7/7] fix cr --- 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/boxes.scss | 4 ++-- src/scss/cdb-components/colors.scss | 6 +++--- src/scss/cdb-components/forms/toggle.scss | 2 +- src/scss/cdb-components/headers.scss | 2 +- src/scss/cdb-components/loader.scss | 4 ++-- src/scss/cdb-components/menu.scss | 14 +++++++------- src/scss/cdb-components/shapes/dots.scss | 2 +- src/scss/cdb-utilities/defaults.css.scss | 2 +- src/scss/cdb-utilities/helpers.scss | 6 +++--- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot index dcdd55ab0be4f13acd70d48c51d384ce9888cfe3..60e5afa7dded206dbc68f2408afb3f6430b80a3d 100644 GIT binary patch delta 52 zcmZ26nQ_Hr#tAk|)f*?;ZD4wrHSxnVsg2d~{5D@1xEX&j0KujE*ABqw%?lVgJODxR B6@UN$ delta 52 zcmZ26nQ_Hr#tAk|;_oKfZD6_}Gx5VTsdwV>{5D@1xEX&j0KujE$7jOm%?lVgJOCpv B6j}fP diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf index 3fed9de7d31b9b03ed5b3736774c00e57e43f6cc..4279ce37fc62f7e17efb41b68afa49da758612b6 100644 GIT binary patch delta 45 ucmew}k@3$&#tBYL@3JPkOq1GJ9nWv`m4Tb_7XuJnx_|8ejNbT#!vg@diW4FL delta 45 ucmew}k@3$&#tBYL7i1>7Op|&i9?x&{m4Tb_7XuJnx_^8ojNbT#!vg@GkP;&R diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff index bc80aec19be85f7911df131db1f873631099c4de..cf2d67c9cbbd752b885ef2e20854f151ab639848 100644 GIT binary patch delta 59 zcmV-B0L1^iT)bS6dIIihv3$2CC{wP-^V@u7;AZ><6k)h@|Jnf<{igi?cdiJ=KR_-A R0~1IT0KnxClCxVU;RcV995Mg^ delta 59 zcmV-B0L1^iT)bS6dIHcKv3$2CC>M+4`E9;3a5Me_iZEQde|#p4epCMcJ68nbA0U^5 Rfe9oE0I