Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Twitter #532

Merged
merged 1 commit into from
Oct 10, 2024
Merged
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
9 changes: 3 additions & 6 deletions app/components/splash-screen.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
<li><LinkTo @route="talks"><FaIcon @icon="keynote" @prefix="fas" aria-hidden="false" @title="Talks" /> Talks</LinkTo></li>
<li><LinkTo @route="projects"><FaIcon @icon="project-diagram" @prefix="fas" aria-hidden="false" @title="Projects" /> Projects</LinkTo></li>
<li><LinkTo @route="resume"><FaIcon @icon="scroll" @prefix="fas" aria-hidden="false" @title="Resume" /> Resume</LinkTo></li>
<li><a href="https://github.com/jrjohnson"><FaIcon @icon="github" @prefix="fab" /> Github</a></li>
<li><a href="https://www.linkedin.com/in/jonjohnson/"><FaIcon @icon="linkedin" @prefix="fab" /> LinkedIn</a></li>
</ul>
<ul>
<li><a href="https://github.com/jrjohnson"><FaIcon @icon="github" @prefix="fab" aria-hidden="false" @title="Github Profile" /></a></li>
<li><a href="https://twitter.com/jrjohnson_"><FaIcon @icon="twitter" @prefix="fab" aria-hidden="false" @title="Twitter Profile" /></a></li>
<li><a href="https://www.linkedin.com/in/jonjohnson/"><FaIcon @icon="linkedin" @prefix="fab" aria-hidden="false" @title="LinkedIn Profile" /></a></li>
</ul>
<img class="avatar" src="/media/avatar.jpg" alt="jon's avatar">
<img class="avatar" src="/media/avatar.png" alt="jon's avatar">
</nav>
</main>
29 changes: 8 additions & 21 deletions app/styles/layout/body.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,15 @@ body {
@media (min-width: 500px) {
justify-content: flex-start;
}
}

& img {
border-radius: 50%;
padding: 5px;
width: 50px;
& img {
border-radius: 50%;
padding: 0 5px;
width: var(--fs-xxl);
@media (max-width: 400px) {
width: var(--fs-xl);
}
}
}
}

Expand Down Expand Up @@ -137,22 +140,6 @@ body {
grid-area: footer;
display: flex;
justify-content: flex-end;
& ul {
display: flex;
flex-direction: row;
@include font-size("large");
list-style-type: none;
margin: 0;
padding: 0;

& svg {
margin-left: 1rem;
}
}

& li {
padding-right: 1rem;
}
}
}

Expand Down
16 changes: 4 additions & 12 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<header>
<h1>
<LinkTo @route="index">
<img src="/media/avatar.jpg" alt="jon's avatar">
<img src="/media/avatar.png" alt="jon's avatar">
Jonathan Johnson
</LinkTo>
</h1>
Expand All @@ -16,17 +16,9 @@
<li><LinkTo @route="talks">Talks</LinkTo></li>
<li><LinkTo @route="projects">Projects</LinkTo></li>
<li><LinkTo @route="resume">Resume</LinkTo></li>

</ul>
</nav>
<main>{{outlet}}</main>
<footer>
<nav aria-label="Footer">
<ul>
<li><a href="https://github.com/jrjohnson"><FaIcon @icon="github" @prefix="fab" aria-hidden="false" @title="Github Profile" /></a></li>
<li><a href="https://twitter.com/jrjohnson_"><FaIcon @icon="twitter" @prefix="fab" aria-hidden="false" @title="Twitter Profile" /></a></li>
<li><a href="https://www.linkedin.com/in/jonjohnson/"><FaIcon @icon="linkedin" @prefix="fab" aria-hidden="false" @title="LinkedIn Profile" /></a></li>
</ul>
</nav>
</footer>
<main>
{{outlet}}
</main>
{{/if}}
1 change: 0 additions & 1 deletion markdown/pages/resume.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ css: resume.css
* (650) 516-7401
* [https://www.jrjohnson.dev](https://www.jrjohnson.dev)
* ![Github](/media/github_mark.svg)[jrjohnson](https://github.com/jrjohnson)
* ![twitter](/media/twitter_mark.svg)[jrjohnson_](https://twitter.com/jrjohnson_)

------

Expand Down
Binary file removed public/media/avatar.jpg
Binary file not shown.
Binary file added public/media/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/media/resume.pdf
Binary file not shown.