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
26 changes: 1 addition & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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