From f93a9808547d59affdf19abd21d9e95571aca495 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Tue, 29 Oct 2019 22:21:51 +0100 Subject: [PATCH] Move variables back to stylesheets --- config/variables.scss | 9 --------- src/components/About.scss | 2 +- src/components/Blog.scss | 2 +- src/components/Header.scss | 2 +- src/components/Home.scss | 2 +- src/components/Navbar.scss | 2 +- src/components/Post.scss | 2 +- src/components/Spinner.scss | 2 +- src/components/Wrapper.scss | 2 +- src/stylesheets/content.scss | 2 +- src/stylesheets/globals.scss | 2 +- 11 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 config/variables.scss diff --git a/config/variables.scss b/config/variables.scss deleted file mode 100644 index 70cb7b2..0000000 --- a/config/variables.scss +++ /dev/null @@ -1,9 +0,0 @@ -$font-header: 'Open Sans Condensed', sans-serif; -$font-paragraph: 'Open Sans', sans-serif; -$white: #fdfdfd; -$black: #2f2f2f; -$blue: #144A98; -$grey: #A9A9A9; -$body: #f1f1f1; -$navbar: #1B4367; -$break-large: 992px; diff --git a/src/components/About.scss b/src/components/About.scss index 6a89082..ac1cbf6 100644 --- a/src/components/About.scss +++ b/src/components/About.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .about { flex: 30%; diff --git a/src/components/Blog.scss b/src/components/Blog.scss index 2094450..a31d366 100644 --- a/src/components/Blog.scss +++ b/src/components/Blog.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .postDate { float: right; diff --git a/src/components/Header.scss b/src/components/Header.scss index 7181fa1..06763c0 100644 --- a/src/components/Header.scss +++ b/src/components/Header.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .mainHeader { border-left: 5px solid $blue; diff --git a/src/components/Home.scss b/src/components/Home.scss index d485e2c..abc1e5b 100644 --- a/src/components/Home.scss +++ b/src/components/Home.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; #coverPage { background: url('/static/background.jpg') no-repeat center center fixed; diff --git a/src/components/Navbar.scss b/src/components/Navbar.scss index dbcbfe2..920737e 100644 --- a/src/components/Navbar.scss +++ b/src/components/Navbar.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .navbar { background-color: $navbar; diff --git a/src/components/Post.scss b/src/components/Post.scss index 23a34e8..bb9bb8e 100644 --- a/src/components/Post.scss +++ b/src/components/Post.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .postContent { clear: both; diff --git a/src/components/Spinner.scss b/src/components/Spinner.scss index 1b0b98f..3cd4572 100644 --- a/src/components/Spinner.scss +++ b/src/components/Spinner.scss @@ -1,7 +1,7 @@ /* from https://loading.io/css/ */ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .spinnerWrapper { width: 100%; diff --git a/src/components/Wrapper.scss b/src/components/Wrapper.scss index 3965727..1dc67b1 100644 --- a/src/components/Wrapper.scss +++ b/src/components/Wrapper.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "../stylesheets/variables.scss"; .centerContent { text-align: center; diff --git a/src/stylesheets/content.scss b/src/stylesheets/content.scss index 266e833..7232da4 100644 --- a/src/stylesheets/content.scss +++ b/src/stylesheets/content.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "./variables.scss"; .contentWrapper { display: inline-block; diff --git a/src/stylesheets/globals.scss b/src/stylesheets/globals.scss index 5287963..7a6923e 100644 --- a/src/stylesheets/globals.scss +++ b/src/stylesheets/globals.scss @@ -1,4 +1,4 @@ -@import "../../config/variables.scss"; +@import "./variables.scss"; :global(body, html) { height: 100%;