diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/App.js | 2 | ||||
-rw-r--r-- | src/components/Tile/Tile.js | 19 | ||||
-rw-r--r-- | src/components/Tile/Tile.scss | 8 | ||||
-rw-r--r-- | src/components/Views/Home.css | 11 | ||||
-rw-r--r-- | src/components/Views/Home.js (renamed from src/components/Views/Home/Home.js) | 7 | ||||
-rw-r--r-- | src/components/Views/Home.scss (renamed from src/components/Views/Home/Home.scss) | 8 | ||||
-rw-r--r-- | src/components/Views/Home/Home.css | 17 |
7 files changed, 22 insertions, 50 deletions
diff --git a/src/components/App.js b/src/components/App.js index 4f71c90..660e7f6 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,6 +1,6 @@ import React from "react"; import Header from "./Header/Header"; -import HomeView from "./Views/Home/Home"; +import HomeView from "./Views/Home"; const App = () => { const currentview = "home"; diff --git a/src/components/Tile/Tile.js b/src/components/Tile/Tile.js index 6fa7f2c..2c67741 100644 --- a/src/components/Tile/Tile.js +++ b/src/components/Tile/Tile.js @@ -1,20 +1,15 @@ import React from "react"; // import React, { useState } from "react"; -import "./Tile.css"; +// import "./Tile.css"; const Tile = (props) => { - // const [,] = useState() - - const style = { - height: props.height; - width: props.width; - backgroundColor: props.colorBG - // textColor: props.colorFG - } - + // const [activeLink, updateActiveLink] = useState("home") return ( - <div className={"tile"} style={style}></div> + <div className={"tile"} style={{ + "height": props.height, + "width": props.width + }}></div> ) } -export default Tile +export default Tile; diff --git a/src/components/Tile/Tile.scss b/src/components/Tile/Tile.scss index 54a5ad7..d1c62ce 100644 --- a/src/components/Tile/Tile.scss +++ b/src/components/Tile/Tile.scss @@ -1,12 +1,4 @@ @import "../../../styles/theme"; -@import "../../../styles/view"; - -.view { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center;; -} .tile { width: 5rem; diff --git a/src/components/Views/Home.css b/src/components/Views/Home.css index e69de29..39a8bc2 100644 --- a/src/components/Views/Home.css +++ b/src/components/Views/Home.css @@ -0,0 +1,11 @@ +@import url("https://fonts.googleapis.com/css2?family=Quicksand:wght@500&display=swap"); +/* Experimental color scheme */ +.view { + width: 80%; + margin: 2rem auto; } + +.view { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; } diff --git a/src/components/Views/Home/Home.js b/src/components/Views/Home.js index 51c4c4f..ab8b66f 100644 --- a/src/components/Views/Home/Home.js +++ b/src/components/Views/Home.js @@ -1,14 +1,13 @@ import React from "react"; // import React, { useState } from "react"; +import "./../Tile/Tile"; import "./Home.css"; -const HomeView = (procs) => { - const tileHeight = procs.height; - const tileWidth = procs.width; +const HomeView = () => { // const [activeLink, updateActiveLink] = useState("home") return ( <div className={"view"}> - <div className={"tile"}></div> + <Tile height="1rem" width="1rem"></Tile> </div> ) } diff --git a/src/components/Views/Home/Home.scss b/src/components/Views/Home.scss index 54a5ad7..cd07dd5 100644 --- a/src/components/Views/Home/Home.scss +++ b/src/components/Views/Home.scss @@ -7,11 +7,3 @@ flex-wrap: wrap; justify-content: center;; } - -.tile { - width: 5rem; - height: 5rem; - - border: 1px dashed $defFG; - margin: 1rem; -} diff --git a/src/components/Views/Home/Home.css b/src/components/Views/Home/Home.css deleted file mode 100644 index 4f5cb8d..0000000 --- a/src/components/Views/Home/Home.css +++ /dev/null @@ -1,17 +0,0 @@ -@import url("https://fonts.googleapis.com/css2?family=Quicksand:wght@500&display=swap"); -/* Experimental color scheme */ -.view { - width: 80%; - margin: 2rem auto; } - -.view { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; } - -.tile { - width: 5rem; - height: 5rem; - border: 1px dashed #000000; - margin: 1rem; } |