fix: consistency of styling across multiple pages

hopetambala · Nov 2, 2019 · 4178986 · 4178986
1 parent bb28de4
commit 4178986
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/src/index.css b/src/index.css
@@ -6,7 +6,7 @@ p  {
 }
 h1 , h2, h3, h4, h5, h6 {
   font-family: 'Roboto Black', serif !important;
-  font-weight: 550 !important;
+  /* font-weight: 550 !important; */
 }
 
 h1  {

diff --git a/src/js/App.js b/src/js/App.js
@@ -16,8 +16,6 @@ import Button from '@material-ui/core/Button';
 import appStyle from './App.module.css';
 import {styles} from '../styles';
 
-
-
 // import goldClear from '../assets/goldClear.png';
 
 //Pages

diff --git a/src/js/pages/Login.js b/src/js/pages/Login.js
@@ -5,6 +5,9 @@ import { Redirect, Link } from "react-router-dom";
 //Styles
 import { Button, Form, Grid, Header, Message, Segment } from 'semantic-ui-react';
 import loginStyles from './Login.module.css';
+import { styles } from '../../styles';
+import Typography from '@material-ui/core/Typography';
+
 
 //Redux
 import { connect } from "react-redux";
@@ -60,8 +63,13 @@ class LoginForm extends React.Component{
         return(
             <Grid textAlign='center' style={{ height: '100vh' }} verticalAlign='middle' className={loginStyles.grid}>
                 <Grid.Column style={{ maxWidth: 450 }}>
-                <Header as={Link} to="/" className={loginStyles.header} textAlign='center'>
+                {/* <Header as={Link} to="/" className={loginStyles.header} textAlign='center'>
                     <h1>PUENTE</h1>
+                </Header> */}
+                <Header as={Link} to="/">
+                    <Typography  variant="h1" >
+                        <div style={{color:styles.theme.primaryAppColor}}>PUENTE</div>
+                    </Typography>
                 </Header>
                 <Form size='large' onSubmit={this.handleSubmit}>
                     <Segment stacked>

diff --git a/src/js/pages/Login.module.css b/src/js/pages/Login.module.css
@@ -1,11 +1,11 @@
 .grid {
-    color: #f8af1e !important;
+    color: #FDD00C !important;
 }
 
 .header{
-    color: #f8af1e !important;
+    color: #FDD00C !important;
 }
 .button{
-    background: #f8af1e !important;
+    background: #FDD00C !important;
 }
 
diff --git a/src/js/pages/Map.js b/src/js/pages/Map.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Row, Container, Card } from 'react-bootstrap';
+import { Row, Container } from 'react-bootstrap';
 
 
 //Components

diff --git a/src/landing-page/landing.js b/src/landing-page/landing.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Link } from "react-router-dom";
 
+import Typography from '@material-ui/core/Typography';
 import {
   Button,
   Container,
@@ -17,6 +18,7 @@ import {
 } from 'semantic-ui-react';
 
 import landingStyle from './landing.module.css';
+import { styles } from '../styles';
 
 import logo from '../assets/goldClear.png';
 
@@ -113,7 +115,9 @@ class DesktopContainer extends Component {
               <Container>
                 <Image className={landingStyle.logopic} src={logo} />
                 <Menu.Item position='left'>
-                  <h1>Puente</h1>
+                  <Typography variant="h4" >
+                    <div style={{color:styles.theme.primaryAppColor}}>Puente</div>
+                  </Typography>
                 </Menu.Item>
                 <Menu.Item position='right'>
                   <Button as={Link} to='/login' inverted={fixed}>