Updated Styling (#14)

-Fixed import issue with Charity Page -Added header and footer to Login and Registration Pages -Fixed issue with &nbsp showing up as a letter
good-emporium · Sep 9, 2018 · a723bff · a723bff
1 parent 3c8b78f
commit a723bff
Show file tree

Hide file tree

Showing 8 changed files with 1,625 additions and 1,608 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/css/ge-styles.css b/src/css/ge-styles.css
diff --git a/src/css/ge-styles.css.map b/src/css/ge-styles.css.map
diff --git a/src/scripts/components/Header/LoginRegisterSearch.js b/src/scripts/components/Header/LoginRegisterSearch.js
@@ -7,18 +7,20 @@ const loginRegisterSearch = () => {
     return (
         <div className='float-right'>
             <div>
+                <span className="nav-links">
                 <Link to={'/login/'}>
                     Login   
                 </Link>
-                &nbsp;
+                </span>
+                <span className="nav-links">
                 <Link to={'/register/'}>
                     Register 
                 </Link>
-                &nbsp;
+                </span>
                 <form className='float-right' autoComplete="off">
                     <div className="autocomplete">
                         <input className="search-box" id="myInput" type="text" name="myCountry" />
-                            <i class="fas fa-search"></i>
+                            <i className="fas fa-search"></i>
 
                     </div>
                 </form>

diff --git a/src/scripts/pages/CharityPage/CharitiyDetails/CharityLeft/CharityData.js b/src/scripts/pages/CharityPage/CharitiyDetails/CharityLeft/CharityData.js
@@ -1,5 +1,5 @@
 import React from 'react';
-
+import Divider from '../../../../components/Divider'
 
 const charityData = () => {
     return (

diff --git a/src/scripts/pages/LoginPage/Form.js b/src/scripts/pages/LoginPage/Form.js
@@ -1,7 +1,10 @@
 import React from 'react';
+import Header from '../../components/Header/Header';
+import Footer from '../../components/Footer/Footer';
 const form = () => {
     return (
         <div className="container">
+        <Header />
             <form>
                 <h1>Sign In</h1>
                 <label htmlFor="username"><b>Username</b></label>
@@ -13,6 +16,7 @@ const form = () => {
                 <button type="button">Cancel</button>
                 <button type="submit">Sign In</button>
             </form>
+            <Footer />
         </div>
     )
 

diff --git a/src/scripts/pages/RegisterPage/Form.js b/src/scripts/pages/RegisterPage/Form.js
@@ -1,7 +1,10 @@
 import React from 'react';
+import Header from '../../components/Header/Header';
+import Footer from '../../components/Footer/Footer';
 const form = () => {
     return (
         <div className="container">
+        <Header />
             <form>
                 <h1>Sign Up</h1>
                 <p>Please fill in this form to create an account.</p>
@@ -47,6 +50,7 @@ const form = () => {
                 <button type="button">Cancel</button>
                 <button type="submit">Sign Up</button>
             </form>
+            <Footer />
         </div>
     )
 

diff --git a/src/scss/ge-styles.scss b/src/scss/ge-styles.scss
@@ -60,6 +60,9 @@ body {
 	    color: gray;
 	}
 }
+.nav-links {
+	padding: 10px;
+}
 
 /* FOOTER STYLES */