styling HomePage, HomeHeader, Auth; #13; #15

BCIT-SSD-2020-21 · Apr 12, 2021 · bbeb0fe · bbeb0fe
1 parent cc39637
commit bbeb0fe
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/src/containers/Auth.js b/src/containers/Auth.js
@@ -1,5 +1,5 @@
 import React, {useState, useEffect} from 'react';
-import LandingHeader from './LandingHeader';
+import LandingHeader from './HomeHeader';
 import AppBar from '@material-ui/core/AppBar';
 import Login from './Login';
 import Register from './Register';
@@ -41,7 +41,7 @@ export default function Auth() {
     return (
         <div className={classes.authContainer}>
 
-            <Typography>{selectedTabTitle}</Typography>
+            <Typography className={classes.authTitle}>{selectedTabTitle}</Typography>
             <AppBar className={classes.authAppBar} position="static">
             <Tabs
                 className={classes.authTabs}

diff --git a/src/containers/Login.js b/src/containers/Login.js
@@ -36,7 +36,7 @@ export default function Login() {
                         // type="email"
                         label="Email"
                         placeholder="[email protected]"
-                        disableUnderline="true"
+                        disableUnderline={true}
                         required 
                         startAdornment={
                             <InputAdornment position="start">
@@ -55,7 +55,7 @@ export default function Login() {
                         type="password"
                         label="Password"
                         placeholder="h3alth15w3alth"
-                        disableUnderline="true"
+                        disableUnderline={true}
                         required 
                         startAdornment={
                             <InputAdornment position="start">

diff --git a/src/containers/Register.js b/src/containers/Register.js
@@ -0,0 +1,9 @@
+import React from 'react'
+
+export default function Register() {
+    return (
+        <div>
+            <h1>Register</h1>
+        </div>
+    )
+}
diff --git a/src/styles/authStyles.js b/src/styles/authStyles.js
@@ -8,7 +8,14 @@ const authStyles = makeStyles(() => ({
         width: '80%',
 		margin: 'auto',
 		borderRadius: '15px',
-
+        paddingBottom: '100px',
+    },
+    authTitle: {
+        fontSize: '32px',
+        fontStyle: 'italic',
+        textAlign: 'left',
+        paddingLeft: '10%',
+        color: holisticTheme.textTitle,
     },
     authAppBar: {
         borderRadius: '15px 15px 0 0',
@@ -19,6 +26,7 @@ const authStyles = makeStyles(() => ({
         // backgroundColor: holisticTheme.bgContainer,
     },
     authForm: {
+        // paddingBottom: '20px',
         borderRadius: '0 0 15px 15px',
 		// flexGrow: 1,
 		backgroundColor: holisticTheme.bgContainer,
@@ -30,7 +38,6 @@ const authStyles = makeStyles(() => ({
     authField: {
         width: '85%',
         marginTop: '10px',
-
     },
     authFormLabel: {
         color: holisticTheme.textLabel,
@@ -57,12 +64,6 @@ const authStyles = makeStyles(() => ({
         color: holisticTheme.textBtnPrimary,
         backgroundColor: holisticTheme.bgBtnPrimary,
     },
-	close: {
-		fontSize: 40,
-		justifyContent: 'flex-end',
-		backgroundColor: 'white',
-		borderRadius: 0.5,
-	},
 }));
 
 export default authStyles;
diff --git a/src/styles/colorThemes.js b/src/styles/colorThemes.js
@@ -5,6 +5,8 @@ export const holisticTheme = {
     textRoot: '#EFEFEF',
     // Container
     bgContainer: '#A395B8',
+    // Font
+    textTitle: '#AAB895',
     // Text Inputs
     bgInput: '#C4C4C4',
     textLabel: '#EFEFEF',
@@ -16,4 +18,5 @@ export const holisticTheme = {
     bgBtnSecondary: '#C8D1BB',
     textBtnSecondary: '#4E755C',
 
-}
+}
+