From 689d1b4df09d4bbf56480b48f0d03094f5824ee3 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Sat, 26 Aug 2017 21:23:05 -0500 Subject: [PATCH] formatting --- app/Wrapper.tsx | 35 ++++++++--------- app/app.tsx | 3 +- app/components/Navbar/Navbar.scss | 57 ++++++++++++++-------------- app/components/Navbar/Navbar.tsx | 63 ++++++++++++++++++------------- app/pages/Home/Home.scss | 4 +- app/pages/Home/Home.tsx | 26 ++++--------- app/pages/NotFound/NotFound.scss | 8 ++-- app/pages/NotFound/NotFound.tsx | 26 ++++--------- app/scss/style.scss | 24 ++++++------ app/scss/variables.scss | 2 +- 10 files changed, 115 insertions(+), 133 deletions(-) diff --git a/app/Wrapper.tsx b/app/Wrapper.tsx index d7221ae..53fc036 100644 --- a/app/Wrapper.tsx +++ b/app/Wrapper.tsx @@ -8,27 +8,22 @@ import NotFound from './pages/NotFound/NotFound'; //styling import './scss/index.scss'; -interface Props { - -} +interface Props {} -interface State { - -} +interface State {} export default class Wrapper extends React.Component { - - render() { - return ( - -
- - - - - -
-
- ); - } + render() { + return ( + +
+ + + + + +
+
+ ); + } } diff --git a/app/app.tsx b/app/app.tsx index be95aa6..5bdcc4d 100644 --- a/app/app.tsx +++ b/app/app.tsx @@ -3,5 +3,4 @@ import ReactDOM from 'react-dom'; import Wrapper from './Wrapper'; -ReactDOM.render( -, document.getElementById('app')); +ReactDOM.render(, document.getElementById('app')); diff --git a/app/components/Navbar/Navbar.scss b/app/components/Navbar/Navbar.scss index 9698eac..de72e1e 100644 --- a/app/components/Navbar/Navbar.scss +++ b/app/components/Navbar/Navbar.scss @@ -1,42 +1,41 @@ @import '../../scss/variables'; .Navbar__nav { - height: 40px; - border-bottom: 1px solid $light3; - display: flex; - background-color: $light1; + height: 40px; + border-bottom: 1px solid $light3; + display: flex; + background-color: $light1; } .Navbar__header { - display: flex; - height: 50px; - align-items: center; - justify-content: space-between; - padding-left: 10px; - padding-right: 10px; - background-color: $dark2; + display: flex; + height: 50px; + align-items: center; + justify-content: space-between; + padding-left: 10px; + padding-right: 10px; + background-color: $dark2; } .Navbar__item { - color: $fontPrimary; - text-decoration: none; - width: 100px; - transition: all 0.1s linear; - text-align: center; - line-height: 40px; - - &:hover { - color: $fontSecondary; - border-bottom: 2px solid $primaryBlue; - } - - & + .Navbar__item { - border-left: 1px solid $light3; - } - + color: $fontPrimary; + text-decoration: none; + width: 100px; + transition: all 0.1s linear; + text-align: center; + line-height: 40px; + + &:hover { + color: $fontSecondary; + border-bottom: 2px solid $primaryBlue; + } + + & + .Navbar__item { + border-left: 1px solid $light3; + } } .Navbar__item--active { - color: $fontSecondary; - border-bottom: 2px solid $primaryBlue; + color: $fontSecondary; + border-bottom: 2px solid $primaryBlue; } diff --git a/app/components/Navbar/Navbar.tsx b/app/components/Navbar/Navbar.tsx index 2d4a855..8f4d71e 100644 --- a/app/components/Navbar/Navbar.tsx +++ b/app/components/Navbar/Navbar.tsx @@ -3,36 +3,45 @@ import { NavLink } from 'react-router-dom'; import './Navbar.scss'; -interface Props { - -} +interface Props {} -interface State { - -} +interface State {} export default class Navbar extends React.Component { + constructor(props: Props) { + super(props); + } - constructor(props: Props) { - super(props); - } + render() { + return ( +
+
+ React Starter + + GitHub +