From 0e352434d3db3279e6528fde1b26e20db1a35c5a Mon Sep 17 00:00:00 2001
From: Clement G <clement@garrot.org>
Date: Mon, 10 Jun 2019 12:51:32 +0200
Subject: [PATCH] Refactor scss files

---
 src/App.js                                    |  1 -
 src/index.js                                  |  3 +-
 src/scss/App.scss                             | 31 ---------
 src/scss/_app.scss                            | 68 +++++++++++++++++++
 .../{custom-bootstrap.scss => config.scss}    | 22 +-----
 5 files changed, 70 insertions(+), 55 deletions(-)
 delete mode 100644 src/scss/App.scss
 create mode 100644 src/scss/_app.scss
 rename src/scss/{custom-bootstrap.scss => config.scss} (67%)

diff --git a/src/App.js b/src/App.js
index 453ad37..cf90f01 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { BrowserRouter as Router} from "react-router-dom";
 import Routes from "./Routes.js";
-import './App.css';
 
 import Header from "./components/layouts/Header";
 import Footer from "./components/layouts/Footer";
diff --git a/src/index.js b/src/index.js
index 51aae31..58a3428 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import './scss/custom-bootstrap.scss';
-import './scss/App.scss';
+import './scss/config.scss';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
 
diff --git a/src/scss/App.scss b/src/scss/App.scss
deleted file mode 100644
index 5ff22a4..0000000
--- a/src/scss/App.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.logo-text > h1{
-  font-size:16px;
-  font-weight:bold;
-  margin:0;
-  line-height:1;
-}
-
-.logo-text > h1 > small{
-  display:block;
-  letter-spacing: 0.09em;
-}
-html, body, #root, #root > div{
-  height:100%;
-}
-
-main{
-  min-height: calc(100% - 106px);
-  overflow: auto;
-  padding-top:72px;
-  padding-bottom:36px;
-}
-
-header{
-  position:fixed;
-  z-index:10;
-  width:100%;
-}
-
-footer{
-  padding:25px;
-}
diff --git a/src/scss/_app.scss b/src/scss/_app.scss
new file mode 100644
index 0000000..25f9b39
--- /dev/null
+++ b/src/scss/_app.scss
@@ -0,0 +1,68 @@
+// mieux voter vars
+$mv-blue-color: #009900 !default;
+$mv-red-color: #000099 !default;
+$mv-light-color: #efefff !default;
+
+// Override default variables before the import bootstrap
+$body-bg: #000000 !default;
+$body-color: $mv-light-color !default;
+
+$theme-colors: (
+        "primary": $mv-blue-color,
+        "secondary": $mv-red-color,
+        "light": $mv-light-color,
+        "danger": #990000,
+        "success": #009900,
+        "info": #2B8299,
+        "warning": #FF6E11,
+
+) !default;
+
+.logo-text > h1{
+  font-size:16px;
+  font-weight:bold;
+  margin:0;
+  line-height:1;
+}
+
+.logo-text > h1 > small{
+  display:block;
+  letter-spacing: 0.09em;
+}
+html, body, #root, #root > div{
+  height:100%;
+}
+
+main{
+  background-color:$mv-blue-color;
+  min-height: calc(100% - 106px);
+  overflow: auto;
+  padding-top:72px;
+  padding-bottom:36px;
+}
+
+header{
+  position:fixed;
+  z-index:10;
+  width:100%;
+}
+
+footer{
+  background-color:$body-bg;
+  color:$mv-light-color;
+  padding:25px;
+}
+
+footer a{
+  color:$mv-light-color;
+}
+
+footer a:hover{
+  color:#fff;
+}
+
+hr{
+  border:none;
+  border-top:1px solid $mv-light-color;
+  width:100%;
+}
\ No newline at end of file
diff --git a/src/scss/custom-bootstrap.scss b/src/scss/config.scss
similarity index 67%
rename from src/scss/custom-bootstrap.scss
rename to src/scss/config.scss
index 71e1213..b27e14e 100644
--- a/src/scss/custom-bootstrap.scss
+++ b/src/scss/config.scss
@@ -18,25 +18,5 @@ $theme-colors: (
 
 );
 
-// Import Bootstrap and its default variables
 @import '~bootstrap/scss/bootstrap.scss';
-
-
-main{
- background-color:$mv-blue-color;
-}
-
-footer {
-  background-color:$body-bg;
-  color:$mv-light-color;
-}
-
-footer a{
-  color:$mv-light-color;
-}
-
-footer a:hover{
-  color:#fff;
-}
-
-
+@import 'app.scss';
\ No newline at end of file