Commit a829e476 authored by Nikolay Gromov's avatar Nikolay Gromov

Рефакторинг: переменная для верт. отступа

parent 84648fa8
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.alert { .alert {
position: relative; position: relative;
padding: 0.7em 1.5em 0.7em 1.4em; padding: 0.7em 1.5em 0.7em 1.4em;
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
border-radius: $border-radius; border-radius: $border-radius;
color: $text-color; color: $text-color;
background-color: $gray-lightest; background-color: $gray-lightest;
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
} }
& > * + * { & > * + * {
margin-top: 1em; margin-top: $typo-margin-vertical;
} }
&__header { &__header {
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.breadcrumbs { .breadcrumbs {
padding: 0; padding: 0;
list-style: none; list-style: none;
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
color: $text-color; color: $text-color;
a { a {
......
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
display: block; display: block;
width: 100%; width: 100%;
max-height: rem(500px); max-height: rem(500px);
margin-top: $typo-margin-vertical;
margin-bottom: $typo-margin-vertical;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
margin-bottom: 1rem;
overflow-x: auto; overflow-x: auto;
background-color: $gray-lightest; background-color: $gray-lightest;
border-radius: $border-radius; border-radius: $border-radius;
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority // Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority
.comment { .comment {
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
@media (min-width: $screen-md) { @media (min-width: $screen-md) {
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
position: relative; position: relative;
display: block; display: block;
width: 100%; width: 100%;
margin-top: 1rem; margin-top: $typo-margin-vertical;
margin-bottom: 1rem; margin-bottom: $typo-margin-vertical;
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
.field-actions { .field-actions {
display: block; display: block;
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__text { &__text {
display: block; display: block;
margin-top: 1rem; margin-top: $typo-margin-vertical;
margin-bottom: 1rem; margin-bottom: $typo-margin-vertical;
font-size: $font-size--small; font-size: $font-size--small;
color: $text-color--muted; color: $text-color--muted;
line-height: 1.2em; line-height: 1.2em;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__title { &__title {
display: block; display: block;
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
&__input-wrap { &__input-wrap {
& + & { & + & {
margin-top: 1em; margin-top: $typo-margin-vertical;
} }
&--error { &--error {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__name { &__name {
@include field-name; @include field-name;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__title { &__title {
display: block; display: block;
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
&__input-wrap { &__input-wrap {
& + & { & + & {
margin-top: 1em; margin-top: $typo-margin-vertical;
} }
&--error { &--error {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.field-range { .field-range {
display: block; display: block;
margin-bottom: 1rem; margin-bottom: $typo-margin-vertical;
&__name { &__name {
@include field-name; @include field-name;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__name { &__name {
@include field-name; @include field-name;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__name { &__name {
@include field-name; @include field-name;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
display: block; display: block;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__title { &__title {
@include field-name; @include field-name;
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
&__input-wrap { &__input-wrap {
& + & { & + & {
margin-top: 1em; margin-top: $typo-margin-vertical;
} }
&--error { &--error {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
border: 0; border: 0;
&:not(:last-child) { &:not(:last-child) {
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
} }
} }
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
width: 100%; width: 100%;
max-width: 100%; // Привет IE max-width: 100%; // Привет IE
margin-top: 0; margin-top: 0;
margin-bottom: 1em; 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;
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
// Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority // Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority
.or { .or {
$block-name: &; // #{$block-name}__element
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -182,8 +182,8 @@ hr { ...@@ -182,8 +182,8 @@ hr {
box-sizing: content-box; // Проблема Firefox box-sizing: content-box; // Проблема Firefox
height: 0; // Проблема Firefox height: 0; // Проблема Firefox
overflow: visible; // Проблема Edge и IE overflow: visible; // Проблема Edge и IE
margin-top: 2rem; margin-top: $typo-margin-vertical * 2;
margin-bottom: 2rem; margin-bottom: $typo-margin-vertical * 2;
border: 0; border: 0;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
} }
...@@ -219,7 +219,7 @@ pre, ...@@ -219,7 +219,7 @@ pre,
address, address,
figure { figure {
margin-top: 0; margin-top: 0;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
} }
address { address {
...@@ -228,6 +228,7 @@ address { ...@@ -228,6 +228,7 @@ address {
ul, ul,
ol { ol {
margin-bottom: $typo-margin-vertical;
padding-left: 1.5em; padding-left: 1.5em;
ul, ul,
...@@ -316,6 +317,7 @@ kbd { ...@@ -316,6 +317,7 @@ kbd {
pre { pre {
display: block; display: block;
width: 100%; width: 100%;
margin-bottom: $typo-margin-vertical;
overflow-x: auto; overflow-x: auto;
tab-size: 2; tab-size: 2;
background-color: rgba(#000, 0.08); background-color: rgba(#000, 0.08);
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
.pagination { .pagination {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__item { &__item {
display: block; display: block;
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
// Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority // Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority
.progress { .progress {
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius; border-radius: $border-radius;
text-align: center; text-align: center;
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
margin-bottom: 1em; margin-top: $typo-margin-vertical;
margin-bottom: $typo-margin-vertical;
padding: 0; padding: 0;
list-style: none; list-style: none;
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
// Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority // Очередность: http://nicothin.github.io/idiomatic-pre-CSS/#priority
.table-responsive { .table-responsive {
margin-bottom: 1em; margin-top: $typo-margin-vertical;
margin-bottom: $typo-margin-vertical;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid $border-color; border: 1px solid $border-color;
width: 100%; width: 100%;
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
.table { .table {
display: table; display: table;
width: 100%; width: 100%;
margin-bottom: 1em; margin-top: $typo-margin-vertical;
margin-bottom: $typo-margin-vertical;
border: 1px solid $border-color; border: 1px solid $border-color;
border-collapse: collapse; border-collapse: collapse;
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
$block-name: &; // #{$block-name}__element $block-name: &; // #{$block-name}__element
margin-top: 1em; margin-top: $typo-margin-vertical;
margin-bottom: 1em; margin-bottom: $typo-margin-vertical;
&__links { &__links {
margin: 0; margin: 0;
......
...@@ -47,6 +47,8 @@ $font-size--small: 80%; ...@@ -47,6 +47,8 @@ $font-size--small: 80%;
$line-height: 1.5; $line-height: 1.5;
$typo-margin-vertical: 1em;
$font-family: -apple-system, BlinkMacSystemFont, 'Roboto', 'Ubuntu', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; $font-family: -apple-system, BlinkMacSystemFont, 'Roboto', 'Ubuntu', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
$font-family--monospace: SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; $font-family--monospace: SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace;
// Georgia, Times New Roman, Times, serif // Georgia, Times New Roman, Times, serif
......
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