From 670ecdfe6874be60b14442cc7a56c44d6b8aa671 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 30 Aug 2019 13:00:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?=
=?UTF-8?q?=D0=BD=20=D1=86=D0=B2=D0=B5=D1=82=20=D0=BB=D0=B8=D0=BD=D0=B5?=
=?UTF-8?q?=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
source/_assets/base_style.scss | 2 +-
source/_assets/layout_internal/content-tags.scss | 10 ++++++++++
source/_assets/layout_internal/navigation.scss | 4 +++-
source/_assets/predictor/demo.vue | 3 ++-
source/_assets/vars.scss | 2 ++
5 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/source/_assets/base_style.scss b/source/_assets/base_style.scss
index 260a194..a44492e 100644
--- a/source/_assets/base_style.scss
+++ b/source/_assets/base_style.scss
@@ -36,6 +36,6 @@ a:active {
.hr-line {
height: 0;
display: block;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid $rule-color;
margin: 2em 0;
}
diff --git a/source/_assets/layout_internal/content-tags.scss b/source/_assets/layout_internal/content-tags.scss
index 5150b55..a48e813 100644
--- a/source/_assets/layout_internal/content-tags.scss
+++ b/source/_assets/layout_internal/content-tags.scss
@@ -31,3 +31,13 @@ code {
img {
max-width: 100%;
}
+
+hr {
+ color: $rule-color;
+ border-top: 1px solid $rule-color;
+ border-left: none;
+ border-right: none;
+ border-bottom: none;
+ margin-block-start: 1em;
+ margin-block-end: 1em;
+}
diff --git a/source/_assets/layout_internal/navigation.scss b/source/_assets/layout_internal/navigation.scss
index 9dcad97..ffaa35d 100644
--- a/source/_assets/layout_internal/navigation.scss
+++ b/source/_assets/layout_internal/navigation.scss
@@ -1,6 +1,8 @@
+@import '../vars';
+
.navigation {
display: block;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid $rule-color;
margin-bottom: 1em;
&__actions {
diff --git a/source/_assets/predictor/demo.vue b/source/_assets/predictor/demo.vue
index 19aac19..1d964f4 100644
--- a/source/_assets/predictor/demo.vue
+++ b/source/_assets/predictor/demo.vue
@@ -99,6 +99,7 @@ export default {
</script>
<style lang="scss" scoped>
+@import '../vars';
@import '../components/button';
.app {
@@ -117,7 +118,7 @@ export default {
}
&:hover {
- border-color: #ccc;
+ border-color: $rule-color;
}
}
diff --git a/source/_assets/vars.scss b/source/_assets/vars.scss
index 4480753..17a6f92 100644
--- a/source/_assets/vars.scss
+++ b/source/_assets/vars.scss
@@ -14,3 +14,5 @@ $preferred-width: 740px;
$first-media-step: $preferred-width - 1px;
$mobile-margin: 0.8em;
+
+$rule-color: #e6e6e6;