Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export const Button = ({type = 'default', link, buttonText, onClick}) => {

return (
<div className="button-component">
{type === 'external' && <button aria-label={`${buttonText}, opens in a new tab`}><a href={link} target="_blank" rel="noreferrer">{buttonText} →</a></button>}
{type === 'internal' && <button aria-label={`Navigate to ${buttonText}`}><Link to={link} onClick={smoothScroll}>{buttonText} →</Link></button>}
{type === 'external' && <a href={link} target="_blank" rel="noreferrer"><button aria-label={`${buttonText}, opens in a new tab`}>{buttonText} →</button></a>}
{type === 'internal' && <Link to={link} onClick={smoothScroll}><button aria-label={`Navigate to ${buttonText}`}>{buttonText} →</button></Link>}
{type === 'default' && <button aria-label={buttonText} onClick={onClick}>{buttonText}</button>}
</div>
)
Expand Down
16 changes: 6 additions & 10 deletions src/components/Button/Button.scss
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
border-bottom: solid 1px white;

position: fixed;
z-index: 1;
z-index: 2;

.subpage-link {
color: $White;
Expand Down
2 changes: 2 additions & 0 deletions src/pages/AboutUs/AboutUs.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ export const AboutUs = () => {

return (
<main className='about-us'>
<meta name="description" content="Familiarize yourself with TrickFire Robotics and the competition we compete in. Learn about the majors our team supports, our student leaders, and how to get involved." />

<ImageCarousel
title = "Our Story"
images = {image_carousel_images}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/Events/Events.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export const Events = () => {

return (
<main className='events'>
<meta name="description" content="Learn more about upcoming events TrickFire Robotics is involved in, both on campus and in our community." />

<MaxWidthContainer>
<section className='page-head'>
<h2 className='events-header'>Events</h2>
Expand Down
2 changes: 2 additions & 0 deletions src/pages/GetInvolved/GetInvolved.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const disciplines = ['Software Engineering', 'Mechanical Engineering', 'Electric
export const GetInvolved = () => {
return (
<main className='get-involved'>
<meta name="description" content="Get involved with our team! TrickFire Robotics draws a talented field of students from a variety of majors. We encourage anyone considering joining to give it a chance, and accept new members on a rolling basis." />

<MaxWidthContainer>
<TextImage
imageOrder="image-left"
Expand Down
2 changes: 2 additions & 0 deletions src/pages/Homepage/Homepage.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { HomeEvent } from '../../components/HomeEvent/HomeEvent'
export const Homepage = () => {
return (
<main className='homepage'>
<meta name="description" content="TrickFire Robotics is an interdisciplinary student team at the University of Washington Bothell. We compete in the University Rover Challenge, an international competition challenging students to design and develop rovers relevant to future Mars exploration." />

<Hero/>
<MaxWidthContainer>
<TextImage
Expand Down