Использую переменные цвета текста и фона по умолчанию

htmlacademy-adaptive · Dec 6, 2024 · 3abf0b2 · 3abf0b2
1 parent 9a9acc0
commit 3abf0b2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/source/styles/blocks/example.scss b/source/styles/blocks/example.scss
@@ -1,5 +1,5 @@
 .example {
-  @include block-color($second-color, $tenth-color);
+  @include block-color($body-color, $tenth-color);
 }
 
 .example__container {

diff --git a/source/styles/blocks/footer.scss b/source/styles/blocks/footer.scss
@@ -1,5 +1,5 @@
 .footer {
-  @include block-color($second-color, $eleventh-color);
+  @include block-color($body-color, $eleventh-color);
 }
 
 .footer__container {

diff --git a/source/styles/blocks/gift-card.scss b/source/styles/blocks/gift-card.scss
@@ -1,8 +1,8 @@
 .gift-card {
-  @include block-color($second-color, $thirteenth-color-lighter);
+  @include block-color($body-color, $thirteenth-color-lighter);
 }
 
 .gift-card__desc {
   @include font($primary-font, 16px, 20px);
-  color: $first-color;
+  color: $body-bg;
 }
diff --git 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: $second-color;
+  color: $body-color;
   text-transform: uppercase;
   text-decoration: none;
 }
diff --git a/source/styles/blocks/programms.scss b/source/styles/blocks/programms.scss
@@ -11,7 +11,7 @@
 }
 
 .programms__card {
-  @include block-color($second-color, $eleventh-color);
+  @include block-color($body-color, $eleventh-color);
 }
 
 .programms__title {
@@ -26,7 +26,7 @@
 
 .programms__link {
   @include font($secondary-font, 16px, 16px);
-  color: $second-color;
+  color: $body-color;
   text-transform: uppercase;
   text-decoration: none;
 }
diff --git a/source/styles/blocks/promo.scss b/source/styles/blocks/promo.scss
@@ -1,5 +1,5 @@
 .promo {
-  @include block-color($second-color, $thirteenth-color-lighter);
+  @include block-color($body-color, $thirteenth-color-lighter);
 }
 
 .promo__container {
@@ -8,11 +8,11 @@
 
 .promo__title {
   @include font($secondary-font, 36px, 36px);
-  color: $first-color;
+  color: $body-bg;
 }
 
 .promo__lead {
   @include font($secondary-font, 14px, 14px);
-  color: $first-color;
+  color: $body-bg;
   text-transform: uppercase;
 }
diff --git a/source/styles/common/mixins.scss b/source/styles/common/mixins.scss
@@ -15,14 +15,14 @@
   line-height: $line-height;
 }
 
-@mixin block-color($color: $second-color, $bg-color: $first-color) {
+@mixin block-color($color: $body-color, $bg-color: $body-bg) {
   color: $color;
   background-color: $bg-color;
 }
 
 @mixin button {
   @include font($secondary-font, 16px, 20px);
-  @include block-color($first-color, $thirteenth-color);
+  @include block-color($body-bg, $thirteenth-color);
   text-transform: uppercase;
   text-decoration: none;
 }

diff --git a/source/styles/common/variables.scss b/source/styles/common/variables.scss
@@ -1,16 +1,14 @@
 /* здесь используйте глобальные переменные */
 /* цвета */
 $body-color: #000000;
-
-
-$first-color: #ffffff;
-$second-color: #000000;
+$body-bg: #ffffff;
 $third-color: #111111;
 $fourth-color: #222222;
 $fifth-color: #444444;
 $sixth-color: #666666;
 $seventh-color: #cdcdcd;
 $eighth-color: #d3d3d3;
+$fifteenth-color: #d9d9d9;
 $ninth-color: #e7e7e7;
 $tenth-color: #eaeaea;
 $tenth-color-darker: #ebebeb;
@@ -20,4 +18,3 @@ $twelfth-color-lighter: rgba(94, 170, 47, 0.3);
 $thirteenth-color: #68b738;
 $thirteenth-color-lighter:rgba(104, 183, 56, 0.85);
 $fourteenth-color: #ff8282;
-$fifteenth-color: #d9d9d9;