diff --git a/source/_assets/styles/base_style.scss b/source/_assets/base_style.scss similarity index 53% rename from source/_assets/styles/base_style.scss rename to source/_assets/base_style.scss index a1316bd..8da758e 100644 --- a/source/_assets/styles/base_style.scss +++ b/source/_assets/base_style.scss @@ -1,24 +1,19 @@ +@import 'vars'; + html, body { - font-size: 18px; + font-size: $base-font-size; font-family: 'PT Serif', serif; padding: 0; margin: 0; - @media (max-width: 839px) { - font-size: 16px; + @media (max-width: $preferred-width - 1px) { + font-size: $base-font-size - 2px; margin: { left: 0.8em; right: 0.8em; } } - - @media (max-width: 480px) { - margin: { - left: 0.5em; - right: 0.5em; - } - } } h1, diff --git a/source/_assets/layout_default/style.scss b/source/_assets/layout_default/style.scss index 5bce793..1b46fef 100644 --- a/source/_assets/layout_default/style.scss +++ b/source/_assets/layout_default/style.scss @@ -1,15 +1,10 @@ -@import '../styles/vars'; -@import '../styles/base_style'; +@import '../vars'; +@import '../base_style'; .content { width: $preferred-width; margin: 0 auto; - @media (max-width: 839px) { - margin: 20px 0; - width: auto; - } - @media (max-width: 480px) { margin: 10px 0; width: auto; diff --git a/source/_assets/layout_internal/style.scss b/source/_assets/layout_internal/style.scss index d60c5af..81cf46a 100644 --- a/source/_assets/layout_internal/style.scss +++ b/source/_assets/layout_internal/style.scss @@ -1,5 +1,5 @@ -@import '../styles/vars'; -@import '../styles/base_style'; +@import '../vars'; +@import '../base_style'; .navigation { display: block; @@ -27,14 +27,14 @@ width: $preferred-width; margin: 0 auto; - @media (max-width: 839px) { - width: auto; - } - @media (max-width: 480px) { width: auto; } } -.content { +.hr-line { + height: 0; + display: block; + border-bottom: 1px solid #eee; + margin: 2em 0; } diff --git a/source/_assets/predictor/Demo.vue b/source/_assets/predictor/Demo.vue index 56c341d..37d7ed6 100644 --- a/source/_assets/predictor/Demo.vue +++ b/source/_assets/predictor/Demo.vue @@ -89,7 +89,6 @@ $font-size: 20px; width: 400px; text-align: center; padding: 2em; - border: 1px solid #ccc; @media (max-width: 749px) { padding: 2em 0; width: auto; diff --git a/source/_assets/styles/vars.scss b/source/_assets/styles/vars.scss deleted file mode 100644 index 202b7c6..0000000 --- a/source/_assets/styles/vars.scss +++ /dev/null @@ -1 +0,0 @@ -$preferred-width: 840px; diff --git a/source/_assets/vars.scss b/source/_assets/vars.scss new file mode 100644 index 0000000..486be9c --- /dev/null +++ b/source/_assets/vars.scss @@ -0,0 +1,5 @@ +// Базовый размер шрифта +$base-font-size: 20px; + +// Ширина страницы +$preferred-width: 700px; diff --git a/source/projects/predictor/index.html.twig b/source/projects/predictor/index.html.twig index c2a04b2..2eab692 100644 --- a/source/projects/predictor/index.html.twig +++ b/source/projects/predictor/index.html.twig @@ -29,10 +29,12 @@ title: Гадалка Код гадалки на Github
  • - Код этого примера + Код этого примера
  • + +
    {% endblock %}