Skip to content

Commit

Permalink
Merge pull request #143 from WrippleFoss/refactor/styling-changes
Browse files Browse the repository at this point in the history
Refactor/styling changes
  • Loading branch information
abhishek71994 authored Nov 3, 2019
2 parents 6df50d9 + eaedf97 commit 21efd0f
Show file tree
Hide file tree
Showing 23 changed files with 25,312 additions and 17,672 deletions.
3 changes: 3 additions & 0 deletions src-view/.postcssrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"modules": true
}
26 changes: 10 additions & 16 deletions src-view/Routes.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import React from 'react';
import { render } from "react-dom";
import { Router, Link } from "@reach/router";
import App from './app';
import Login from './components/login/Login'
import React from 'react'
import LandingView from './views/LandingView'
import { Router } from '@reach/router'

let Dash = () => <div>Dash</div>

const routes = ()=> (
<Router>
<App path="/" />
<Dash path="dashboard" />
<Login path="/login" />
</Router>
)

export default routes;
export default () => {
return (
<Router>
<LandingView path='/' />
</Router>
)
}
16 changes: 6 additions & 10 deletions src-view/app.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import React from 'react';
import React from 'react'
// import './assets/styles/index.scss'
import Routes from './Routes'

import AppLayout from './layouts/AppLayout';
import './assets/styles/index.scss';
const App = () => {
return(
<React.Fragment >
<AppLayout />
</React.Fragment>
)
};
return <Routes />
}

export default App;
export default App
5 changes: 5 additions & 0 deletions src-view/assets/styles/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@mixin for-desktop {
@media (orientation: landscape) and (min-device-aspect-ratio: 1/1) {
@content;
}
}
3 changes: 3 additions & 0 deletions src-view/assets/styles/components/AppLayout.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.AppLayout {
display: flex;
}
50 changes: 50 additions & 0 deletions src-view/assets/styles/components/LandingView.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
@import '../variables';
@import '../mixins';


.landingContainer {
background-image: linear-gradient(to right, var(--violet), var(--green));
height: 100vh;
display: flex;
flex-direction: column;
justify-content: space-between;

.landingNavbar {
// justify-self: flex-start;
padding: 1rem;
}

.heroDiv {
display: flex;
justify-content: space-evenly;
flex-wrap: wrap-reverse;
}

.heroText {
>h3 {
font-size: 2rem;
}

display: flex;
flex-direction: column;
justify-content: center;
font-size: 1.5rem;
line-height: 2rem;

.landingButton {
margin-top: 1rem;
}

.greenButton {
width: 100%;
}
}

.heroImage {
display: none;

@include for-desktop {
display: inline;
}
}
}
3 changes: 3 additions & 0 deletions src-view/assets/styles/components/Navbar.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.navbar {
display: flex;
}
40 changes: 0 additions & 40 deletions src-view/assets/styles/components/_layout.scss

This file was deleted.

7 changes: 0 additions & 7 deletions src-view/assets/styles/components/_navbar.scss

This file was deleted.

16 changes: 1 addition & 15 deletions src-view/assets/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@

html,
body,
#root{
#root {
height: 100%;
}


#root{
background-image: linear-gradient(to right, var(--violet), var(--green));
// background-image: linear-gradient(to right, red, orange);
}

.wrapper {
margin-right: auto;
margin-left: auto;
max-width: 960px;
padding-right: 10px;
padding-left: 10px;
}
21 changes: 11 additions & 10 deletions src-view/components/Navbar.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import React from 'react';
import { Link } from '@reach/router';

import Masterlogo from '../assets/logo/master-logo.png';
import '../assets/styles/components/_navbar.scss';
import React from 'react'
import { Link } from '@reach/router'

import Masterlogo from '../assets/logo/master-logo.png'
import styles from '../assets/styles/components/Navbar.module.scss'

const Navbar = () => {
return(
<nav className="navbar">
<div className="navbar-brand">
<Link to="/"><img src={Masterlogo}/></Link>
return (
<nav className={styles.navbar}>
<div className={styles.navbarBrand}>
<Link to='/'>
<img src={Masterlogo} />
</Link>
</div>
</nav>
)
}
export default Navbar;
export default Navbar
24 changes: 0 additions & 24 deletions src-view/components/login/Login.js

This file was deleted.

Loading

0 comments on commit 21efd0f

Please sign in to comment.