diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index e66d7a6..9ce5eb7 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -30,8 +30,8 @@ export const Button = ({type = 'default', link, buttonText, onClick}) => { return (
- {type === 'external' && } - {type === 'internal' && } + {type === 'external' && } + {type === 'internal' && } {type === 'default' && }
) diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss index adfb050..056d20f 100644 --- a/src/components/Button/Button.scss +++ b/src/components/Button/Button.scss @@ -1,20 +1,16 @@ @import '../../variables.scss'; .button-component { - button { background-color: $TrickFireGreen; padding: 0.65rem 1rem; border: none; - - a { - font-family: $font-heading; - color: $Black; - text-decoration: none; - text-transform: uppercase; - font-weight: 600; - font-size: 1.5rem; - } + font-family: $font-heading; + color: $Black; + text-decoration: none; + text-transform: uppercase; + font-weight: 600; + font-size: 1.5rem; } button:hover { diff --git a/src/components/Navbar/Navbar.scss b/src/components/Navbar/Navbar.scss index 952c3d3..fee48d2 100644 --- a/src/components/Navbar/Navbar.scss +++ b/src/components/Navbar/Navbar.scss @@ -7,7 +7,7 @@ border-bottom: solid 1px white; position: fixed; - z-index: 1; + z-index: 2; .subpage-link { color: $White; diff --git a/src/pages/AboutUs/AboutUs.js b/src/pages/AboutUs/AboutUs.js index e66a54c..c965f06 100644 --- a/src/pages/AboutUs/AboutUs.js +++ b/src/pages/AboutUs/AboutUs.js @@ -68,6 +68,8 @@ export const AboutUs = () => { return (
+ + { return (
+ +

Events

diff --git a/src/pages/GetInvolved/GetInvolved.js b/src/pages/GetInvolved/GetInvolved.js index 41be8d1..a9fed8b 100644 --- a/src/pages/GetInvolved/GetInvolved.js +++ b/src/pages/GetInvolved/GetInvolved.js @@ -10,6 +10,8 @@ const disciplines = ['Software Engineering', 'Mechanical Engineering', 'Electric export const GetInvolved = () => { return (
+ + { return (
+ +