diff --git a/src/components/shared/header/header.js b/src/components/shared/header/header.js
deleted file mode 100644
index a020161..0000000
--- a/src/components/shared/header/header.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, {Component} from 'react';
-import './header.css';
-
-class Header extends Component {
- render() {
- return (
-
-
-
-
-
-
-
Intro
-
-
-
Bio
-
-
-
History
-
-
-
Skills
-
-
-
Contact
-
-
-
- );
- }
-}
-
-export default Header;
\ No newline at end of file
diff --git a/src/components/shared/header/header.css b/src/components/shared/header/navigation.css
similarity index 53%
rename from src/components/shared/header/header.css
rename to src/components/shared/header/navigation.css
index 06e9ecf..d2ff3ea 100644
--- a/src/components/shared/header/header.css
+++ b/src/components/shared/header/navigation.css
@@ -4,4 +4,9 @@
.nav-menu-item:hover {
background-color: #d8d8da;
+}
+
+.remove-link-styling {
+ color: inherit !important;
+ text-decoration: inherit !important;
}
\ No newline at end of file
diff --git a/src/components/shared/header/navigation.js b/src/components/shared/header/navigation.js
new file mode 100644
index 0000000..347c71f
--- /dev/null
+++ b/src/components/shared/header/navigation.js
@@ -0,0 +1,59 @@
+import React, {Component} from 'react';
+import './navigation.css';
+
+class NavigationBar extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+
+ };
+
+ this.navigationOptions = [
+ {
+ content: 'Intro',
+ href: '#intro'
+ },
+ {
+ content: 'Bio',
+ href: '#bio'
+ },
+ {
+ content: 'History',
+ href: '#history'
+ },
+ {
+ content: 'Skills',
+ href: '#skills'
+ },
+ {
+ content: 'Contact',
+ href: '#contact'
+ }
+ ];
+ }
+
+ navigationOptions = [];
+
+ render() {
+ return (
+
+ );
+ }
+}
+
+export default NavigationBar;
\ No newline at end of file
diff --git a/src/components/shared/history/history.css b/src/components/shared/history/history.css
index f1f2111..dda5a8c 100644
--- a/src/components/shared/history/history.css
+++ b/src/components/shared/history/history.css
@@ -1,3 +1,7 @@
+.row-height-5 {
+ height: 5rem;
+}
+
* {
box-sizing: border-box !important;
}
diff --git a/src/components/shared/history/history.js b/src/components/shared/history/history.js
index d8669f0..c6cd03b 100644
--- a/src/components/shared/history/history.js
+++ b/src/components/shared/history/history.js
@@ -20,7 +20,7 @@ class History extends Component {
ref: React.createRef(),
heading: 'EnTec - 2015',
content: `I graduated from MDC and was offered a position as a teaching assistant at MDC's school of engineering
- technology. My goal was to inpire students and help them excel in the area of information technology.`,
+ technology. My goal was to inpire students and help them excel in the area of IT.`,
position: 'right'
},
{
@@ -73,34 +73,38 @@ class History extends Component {
getTimelineContainerClasses = (timelineContainer, i) => {
let defaultClasses = 'timeline-container';
+ let isLeft = timelineContainer.position === 'left';
- if (timelineContainer.position === 'left') {
+ if (isLeft) {
defaultClasses += ' timeline-left';
} else {
defaultClasses += ' timeline-right';
}
if (this.state.wasTimelineConatinerInView[i]) {
- return defaultClasses + ' slideInRight animated faster'; /* TODO: fix slideInLeft */
+ defaultClasses += ` ${isLeft ? 'slideInLeft' : 'slideInRight'} animated faster`;
}
- return defaultClasses;
+ return defaultClasses + ' mb-5';
}
render() {
return (
-
-
- {this.timelineContainers.map((timelineContainer, i) => {
- return (
-
timelineContainer.ref = el}>
-
-
{timelineContainer.heading}
-
{timelineContainer.content}
+
+
+
+
+ {this.timelineContainers.map((timelineContainer, i) => {
+ return (
+
timelineContainer.ref = el}>
+
+
{timelineContainer.heading}
+ {timelineContainer.content}
+
-
- );
- })}
+ );
+ })}
+
);
diff --git a/src/components/shared/introduction/introduction.css b/src/components/shared/introduction/introduction.css
index 83a721f..003eeed 100644
--- a/src/components/shared/introduction/introduction.css
+++ b/src/components/shared/introduction/introduction.css
@@ -1,3 +1,4 @@
.align-text-top {
line-height: 100%;
-}
\ No newline at end of file
+}
+
diff --git a/src/components/shared/introduction/introduction.js b/src/components/shared/introduction/introduction.js
index 54f53ac..025af1e 100644
--- a/src/components/shared/introduction/introduction.js
+++ b/src/components/shared/introduction/introduction.js
@@ -89,21 +89,23 @@ class Introduction extends Component {
render() {
return (
-
+
-
diff --git a/src/components/shared/skills/skills.js b/src/components/shared/skills/skills.js
index a6a9486..7e5af76 100644
--- a/src/components/shared/skills/skills.js
+++ b/src/components/shared/skills/skills.js
@@ -70,8 +70,8 @@ class Skills extends Component {
render() {
return (
-