Skip to content

Commit

Permalink
переименовываю переменные для цветов
Browse files Browse the repository at this point in the history
  • Loading branch information
MaksimDoronin committed Dec 7, 2024
1 parent 3b16b4e commit 2ecd059
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 23 deletions.
4 changes: 2 additions & 2 deletions source/styles/blocks/contacts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

.contacts__text {
@include font($secondary-font, 16px, 20px);
color: $emphasis-color;
color: $darkest;
text-transform: uppercase;
}

.contacts__address {
@include font($primary-font, 14px, 20px);
font-style: normal;
color: $secondary-color;
color: $dark;
}
2 changes: 1 addition & 1 deletion source/styles/blocks/example.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

.example__desc {
@include font($primary-font, 12px, 12px);
color: $secondary-color;
color: $dark;
}

.example__info-row .example__desc {
Expand Down
2 changes: 1 addition & 1 deletion source/styles/blocks/features.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

.features__desc {
@include font;
color: $secondary-color;
color: $dark;
}
4 changes: 2 additions & 2 deletions source/styles/blocks/footer.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.footer {
@include block-color($black, $light-color);
@include block-color($black, $light);
}

.footer__container {
Expand All @@ -16,5 +16,5 @@

.footer__copyright {
@include font($primary-font, 16px, 20px);
color: $secondary-color;
color: $dark;
}
10 changes: 5 additions & 5 deletions source/styles/blocks/product-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@

.product-card__title {
@include font($secondary-font, 16px, 20px);
color: $secondary-color-darker;
color: $darker;
text-transform: uppercase;
}

.product-card__desc {
@include font($primary-font, 12px, 16px);
color: $secondary-color;
color: $dark;
}

.product-card--all .product-card__title {
color: $emphasis-color;
color: $darkest;
}

.product-card--all .product-card__button {
background-color: $light-color;
color: $secondary-color;
background-color: $light;
color: $dark;
}
4 changes: 2 additions & 2 deletions source/styles/blocks/programms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

.programms__card {
@include block-color($black, $light-color);
@include block-color($black, $light);
}

.programms__title {
Expand All @@ -21,7 +21,7 @@

.programms__text {
@include font;
color: $secondary-color;
color: $dark;
}

.programms__link {
Expand Down
4 changes: 2 additions & 2 deletions source/styles/blocks/sub-products.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

.sub-products__heading {
@include font($secondary-font, 16px, 16px);
color: $secondary-color-darker;
color: $darker;
text-transform: uppercase;
}

.sub-products__desc {
@include font($primary-font, 14px, 14px);
color: $secondary-color;
color: $dark;
}
12 changes: 4 additions & 8 deletions source/styles/common/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ $white: #ffffff; // Цвет фона по умолчанию
$primary: #68b738; // Цвет основной темы
$primary-lighter: rgba(104, 183, 56, 0.85); //Цвет оверлея над фоновой картинкой
$primary-darker: #5eaa2f; // Цвет кнопок при наведении и при нажатии
$light: #f2f2f2;
$light-color: #f2f2f2; // Цвет фона карточек товара, программ, футера, кнопки
$dark: #444444;
$secondary-color: #444444; // Более светлый цвет текста
$secondary: #222222;
$secondary-color-darker: #222222; // Более тёмный цвет текста
$secondary-darker: #111111;
$emphasis-color: #111111; // Для более контрастного текста
$light: #f2f2f2; // Цвет фона карточек товара, программ, футера, кнопки
$dark: #444444; // Тёмный цвет текста
$darker: #222222; // Более тёмный цвет текста
$darkest: #111111; // Самый тёмный цвет текста
$border-color: #cdcdcd; // Цвет разделителя в карточках и бордера инпута email
$gray-100: #eaeaea; // Цвет фона блока example
$gray-200: #ebebeb; // Цвет разделителя в catalog и фоновый цвет кнопки в состоянии hover и pressed
Expand Down

0 comments on commit 2ecd059

Please sign in to comment.