Merge remote-tracking branch 'origin/upgrade-sf3' into upgrade-sf3

This commit is contained in:
Julien Fastré 2018-06-05 11:41:09 +02:00
commit 3908f32942

View File

@ -10,7 +10,7 @@ $chill-beige: #cabb9f;
$chill-pink: #dd506d; $chill-pink: #dd506d;
$chill-dark-gray: #333333; $chill-dark-gray: #333333;
$chill-light-gray: #b2b2b2; $chill-light-gray: #b2b2b2;
$chill-llight-gray: $chill-light-gray; $chill-llight-gray: #e6e6e6;
$dark-grey: $chill-dark-gray; $dark-grey: $chill-dark-gray;
@ -33,7 +33,7 @@ $black: #111111;
$white: #ffffff; $white: #ffffff;
$light-grey: $chill-light-gray; $light-grey: $chill-light-gray;
/* /*
due to a bug in sass, we must re-declare the variable in css due to a bug in sass, we must re-declare the variable in css
(use of a sass variable after -- does not work) (use of a sass variable after -- does not work)
*/ */
@ -49,7 +49,7 @@ $light-grey: $chill-light-gray;
--chill-pink: #dd506d; --chill-pink: #dd506d;
--chill-dark-gray: #333333; --chill-dark-gray: #333333;
--chill-light-gray: #b2b2b2; --chill-light-gray: #b2b2b2;
--chill-llight-gray: #b2b2b2; --chill-llight-gray: #e6e6e6;
--dark-grey: #333333; --dark-grey: #333333;