diff --git a/source/styles/blocks/example.scss b/source/styles/blocks/example.scss index 8daa097..2ced72c 100644 --- a/source/styles/blocks/example.scss +++ b/source/styles/blocks/example.scss @@ -1,5 +1,5 @@ .example { - @include block-color($body-color, $gray-100); + @include block-color($black, $gray-100); } .example__container { diff --git a/source/styles/blocks/footer.scss b/source/styles/blocks/footer.scss index 6db5630..f8db60d 100644 --- a/source/styles/blocks/footer.scss +++ b/source/styles/blocks/footer.scss @@ -1,5 +1,5 @@ .footer { - @include block-color($body-color, $light-color); + @include block-color($black, $light-color); } .footer__container { diff --git a/source/styles/blocks/gift-card.scss b/source/styles/blocks/gift-card.scss index 7dee4a6..482477b 100644 --- a/source/styles/blocks/gift-card.scss +++ b/source/styles/blocks/gift-card.scss @@ -1,8 +1,8 @@ .gift-card { - @include block-color($body-color, $primary-lighter); + @include block-color($black, $primary-lighter); } .gift-card__desc { @include font($primary-font, 16px, 20px); - color: $body-bg; + color: $white; } diff --git a/source/styles/blocks/navigation.scss b/source/styles/blocks/navigation.scss index 73c42f6..54c5591 100644 --- a/source/styles/blocks/navigation.scss +++ b/source/styles/blocks/navigation.scss @@ -8,7 +8,7 @@ .navigation__link { @include font($secondary-font, 20px, 20px); - color: $body-color; + color: $black; text-transform: uppercase; text-decoration: none; } diff --git a/source/styles/blocks/programms.scss b/source/styles/blocks/programms.scss index 7919b0d..204df8e 100644 --- a/source/styles/blocks/programms.scss +++ b/source/styles/blocks/programms.scss @@ -11,7 +11,7 @@ } .programms__card { - @include block-color($body-color, $light-color); + @include block-color($black, $light-color); } .programms__title { @@ -26,7 +26,7 @@ .programms__link { @include font($secondary-font, 16px, 16px); - color: $body-color; + color: $black; text-transform: uppercase; text-decoration: none; } diff --git a/source/styles/blocks/promo.scss b/source/styles/blocks/promo.scss index da8278c..f10a161 100644 --- a/source/styles/blocks/promo.scss +++ b/source/styles/blocks/promo.scss @@ -1,5 +1,5 @@ .promo { - @include block-color($body-color, $primary-lighter); + @include block-color($black, $primary-lighter); } .promo__container { @@ -8,11 +8,11 @@ .promo__title { @include font($secondary-font, 36px, 36px); - color: $body-bg; + color: $white; } .promo__lead { @include font($secondary-font, 14px, 14px); - color: $body-bg; + color: $white; text-transform: uppercase; } diff --git a/source/styles/common/mixins.scss b/source/styles/common/mixins.scss index b0bf9f0..d933621 100644 --- a/source/styles/common/mixins.scss +++ b/source/styles/common/mixins.scss @@ -15,14 +15,14 @@ line-height: $line-height; } -@mixin block-color($color: $body-color, $bg-color: $body-bg) { +@mixin block-color($color: $black, $bg-color: $white) { color: $color; background-color: $bg-color; } @mixin button { @include font($secondary-font, 16px, 20px); - @include block-color($body-bg, $primary); + @include block-color($white, $primary); text-transform: uppercase; text-decoration: none; } diff --git a/source/styles/common/variables.scss b/source/styles/common/variables.scss index 4308ec2..b5138cc 100644 --- a/source/styles/common/variables.scss +++ b/source/styles/common/variables.scss @@ -1,7 +1,7 @@ /* здесь используйте глобальные переменные */ /* цвета */ -$body-color: #000000; // Передний план (цвет) по умолчанию, включая компоненты -$body-bg: #ffffff; // Фоновый цвет по умолчанию, включая компоненты +$black: #000000; // Цвет текста по умолчанию +$white: #ffffff; // Цвет фона по умолчанию $secondary-color: #444444; // Более светлый цвет текста $secondary-color-darker: #222222; // Более тёмный цвет текста $emphasis-color: #111111; // Для более контрастного текста