Commit c01a1a9e authored by Nikolay Gromov's avatar Nikolay Gromov

Рефакторинг: убрал БЭМ-нейминг из переменных

parent f7e2e328
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
display: block; display: block;
margin-top: 0; margin-top: 0;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
font-size: $font-size--h3; font-size: $font-size-h3;
font-weight: 400; font-weight: 400;
line-height: 1.2; line-height: 1.2;
color: inherit; color: inherit;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
&__price { &__price {
flex-shrink: 0; flex-shrink: 0;
margin: auto 0 0; margin: auto 0 0;
font-size: $font-size--h3 + 2; font-size: $font-size-h3;
font-weight: 700; font-weight: 700;
line-height: 1; line-height: 1;
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
display: block; display: block;
margin-top: $typo-margin-vertical; margin-top: $typo-margin-vertical;
margin-bottom: $typo-margin-vertical; margin-bottom: $typo-margin-vertical;
font-size: $font-size--small; font-size: $font-size-sm;
color: $text-color--muted; color: $text-color--muted;
line-height: 1.2em; line-height: 1.2em;
} }
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
&__heading { &__heading {
padding: $field-padding-vertical $field-padding-horizontal; padding: $field-padding-vertical $field-padding-horizontal;
font-size: $font-size--small; font-size: $font-size-sm;
font-weight: 700; font-weight: 700;
opacity: 0.5; opacity: 0.5;
cursor: default; cursor: default;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
max-width: 100%; // Привет IE max-width: 100%; // Привет IE
margin-top: 0; margin-top: 0;
margin-bottom: $typo-margin-vertical; margin-bottom: $typo-margin-vertical;
font-size: $font-size--h3; font-size: $font-size-h3;
font-family: $font-family; font-family: $font-family;
font-weight: 700; font-weight: 700;
line-height: $line-height; line-height: $line-height;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
text-decoration: none; text-decoration: none;
text-transform: none; text-transform: none;
font-weight: 700; font-weight: 700;
font-size: $font-size--small; font-size: $font-size-sm;
white-space: nowrap; white-space: nowrap;
border-radius: $border-radius; border-radius: $border-radius;
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
&__title { &__title {
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
font-size: $font-size--h4; font-size: $font-size-h4;
line-height: 1.2; line-height: 1.2;
font-weight: 700; font-weight: 700;
color: currentColor; color: currentColor;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
&__inner { &__inner {
padding-left: 0.5rem; padding-left: 0.5rem;
padding-right: 0.5rem; padding-right: 0.5rem;
font-size: $font-size--small; font-size: $font-size-sm;
color: $gray-light; color: $gray-light;
} }
} }
...@@ -202,12 +202,12 @@ h6 { ...@@ -202,12 +202,12 @@ h6 {
color: currentColor; color: currentColor;
} }
h1 { font-size: $font-size--h1; } h1 { font-size: $font-size-h1; }
h2 { font-size: $font-size--h2; } h2 { font-size: $font-size-h2; }
h3 { font-size: $font-size--h3; } h3 { font-size: $font-size-h3; }
h4 { font-size: $font-size--h4; } h4 { font-size: $font-size-h4; }
h5 { font-size: $font-size--h5; } h5 { font-size: $font-size-h5; }
h6 { font-size: $font-size--h6; } h6 { font-size: $font-size-h6; }
p, p,
ul, ul,
...@@ -260,12 +260,12 @@ li { ...@@ -260,12 +260,12 @@ li {
// .small, // .small,
small { small {
font-size: $font-size--small; font-size: $font-size-sm;
} }
sub, sub,
sup { sup {
font-size: $font-size--small; font-size: $font-size-sm;
} }
// .mark, // .mark,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
border: 1px solid $border-color; border: 1px solid $border-color;
border-bottom: 0; border-bottom: 0;
padding: 0.4em $field-padding-horizontal; padding: 0.4em $field-padding-horizontal;
font-size: $font-size--small; font-size: $font-size-sm;
line-height: 1em; line-height: 1em;
color: $text-color--muted; color: $text-color--muted;
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
// text-align: left; // text-align: left;
// padding: 0.4rem $field-padding-horizontal; // padding: 0.4rem $field-padding-horizontal;
// border-bottom: 1px solid $border-color; // border-bottom: 1px solid $border-color;
// font-size: $font-size--small; // font-size: $font-size-sm;
// line-height: 1em; // line-height: 1em;
// color: $text-color--muted; // color: $text-color--muted;
// } // }
......
@mixin field-help-text { @mixin field-help-text {
$text-color--muted: hsl(0, 0%, 50%) !default;
$font-size--small: 0.75em !default;
display: block; display: block;
padding-top: 0.4em; padding-top: 0.4em;
font-size: $font-size--small; font-size: $font-size-sm;
line-height: 1.2em; line-height: 1.2em;
color: $text-color--muted; color: $text-color--muted;
...@@ -15,17 +12,12 @@ ...@@ -15,17 +12,12 @@
@mixin field-focus { @mixin field-focus {
$color-main: hsl(208, 98%, 43%) !default;
$opacity: 0.7 !default;
outline: 0; outline: 0;
box-shadow: 0 0 0 2px rgba($color-main, $opacity); box-shadow: 0 0 0 2px rgba($color-main, $opacity);
} }
@mixin field-name { @mixin field-name {
$line-height: 1.375em !default;
display: block; display: block;
margin-bottom: 0.4em; margin-bottom: 0.4em;
line-height: $line-height; line-height: $line-height;
......
...@@ -41,14 +41,14 @@ $border-color: $gray-lighten; ...@@ -41,14 +41,14 @@ $border-color: $gray-lighten;
$font-size: 16px; $font-size: 16px;
$font-size--h1: 40px; $font-size-h1: 40px;
$font-size--h2: 32px; $font-size-h2: 32px;
$font-size--h3: 24px; $font-size-h3: 24px;
$font-size--h4: 18px; $font-size-h4: 18px;
$font-size--h5: 16px; $font-size-h5: 16px;
$font-size--h6: 16px; $font-size-h6: 16px;
$font-size--small: 80%; $font-size-sm: 0.75em; // 12px от 16px
$line-height: 1.5; $line-height: 1.5;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment