Skip to content

Refactor duplicated code across layouts, stylesheets, and JavaScript #110

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.

Sign up for GitHub

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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+64 −49
Draft

Refactor duplicated code across layouts, stylesheets, and JavaScript #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa318f
Initial plan
Copilot Oct 24, 2025
4b0104a
Refactor duplicated code in layouts and stylesheets
Copilot Oct 24, 2025
3c19fbf
Extract duplicated time calculation into helper function
Copilot Oct 24, 2025
5ef9cb4
Fix comment formatting for consistency
Copilot Oct 24, 2025
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
2 changes: 1 addition & 1 deletion _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
{% include head.html %}
<body>
<body{% if page.body_class or layout.body_class %} class="{{ page.body_class | default: layout.body_class }}"{% endif %}>
{{ content }}
</body>
</html>
54 changes: 26 additions & 28 deletions _layouts/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
<!DOCTYPE html>
<html lang="en">
{% include head.html %}
<body class="home">
<div class="home-intro">
<div class="home-intro-bio">
<div class="home-intro-bio-desc">
<div>
<h1>Adrián Mato</h1>
<h2>Design Director at GitHub Copilot <span class="ampersand">&amp;</span> startup investor.</h2>
<p>
For the last 18+ years, I've designed digital products between Madrid, London and now, from
San Francisco. I also co-founded and later sold my company Erasmusu.
</p>
<p>
My career started as a Software Developer, but it soon became clear that my true passion was Design.
I love combining both skillsets to create products that fulfill a clear purpose.
</p>
</div>
---
layout: default
body_class: home
---
<div class="home-intro">
<div class="home-intro-bio">
<div class="home-intro-bio-desc">
<div>
<h1>Adrián Mato</h1>
<h2>Design Director at GitHub Copilot <span class="ampersand">&amp;</span> startup investor.</h2>
<p>
For the last 18+ years, I've designed digital products between Madrid, London and now, from
San Francisco. I also co-founded and later sold my company Erasmusu.
</p>
<p>
My career started as a Software Developer, but it soon became clear that my true passion was Design.
I love combining both skillsets to create products that fulfill a clear purpose.
</p>
</div>
</div>
<svg class="home-intro-scroll" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M12 18.23l5.584-5.584 1.365 1.365-8.041 8.04-7.857-7.856 1.377-1.376L10 18.391V1h2v17.23z" fill-rule="evenodd"/>
</svg>
</div>
{% include home-navigation.html %}
{% include home-work.html %}
<svg class="home-intro-scroll" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M12 18.23l5.584-5.584 1.365 1.365-8.041 8.04-7.857-7.856 1.377-1.376L10 18.391V1h2v17.23z" fill-rule="evenodd"/>
</svg>
</div>
{% include home-navigation.html %}
{% include home-work.html %}

<script type="text/javascript" src="/assets/js/ios.js"></script>
<script type="text/javascript" src="/assets/js/s.js"></script>
</body>
</html>
<script type="text/javascript" src="/assets/js/ios.js"></script>
<script type="text/javascript" src="/assets/js/s.js"></script>
19 changes: 19 additions & 0 deletions _sass/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,22 @@ a {
.h-bradius {
border-radius: .1rem;
}

/**
* Common placeholders for repeated patterns
*/
%transition-slow {
transition: all var(--base-trans-slow) ease-in-out;
}

%transition-base {
transition: all var(--base-trans) ease-in-out;
}

%transition-mid {
transition: all var(--base-trans-mid) ease-in-out;
}

%hover-brand-color:hover {
color: var(--brand-color);
}
26 changes: 10 additions & 16 deletions _sass/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,8 @@ pre {
text-decoration: none;
padding: 2rem 1.4rem;
position: relative;
transition: all var(--base-trans-slow) ease-in-out;
}

.home-navigation a:hover {
color: var(--brand-color);
@extend %transition-slow;
@extend %hover-brand-color;
}

@keyframes home-intro-desc-animation {
Expand All @@ -114,7 +111,7 @@ pre {
fill: var(--text-color);
visibility: hidden;
opacity: 0;
transition: all var(--base-trans) ease-in-out;
@extend %transition-base;
position: fixed;
bottom: 5.2rem;
right: 4.8rem;
Expand Down Expand Up @@ -189,7 +186,8 @@ pre {
color: var(--title-color);
text-decoration: none;
outline: none;
transition: all var(--base-trans-slow) ease-in-out;
@extend %transition-slow;
@extend %hover-brand-color;
}
}

Expand All @@ -203,10 +201,6 @@ pre {
color: var(--text-color);
}

.home-work-grid__project-description a:hover {
color: var(--brand-color);
}

.home-work-grid__project-screenshot {
margin-bottom: 11.2rem;
}
Expand Down Expand Up @@ -262,7 +256,7 @@ pre {
position: relative;
text-decoration: none;
font-weight: 500;
transition: all var(--base-trans) ease-in-out;
@extend %transition-base;
}

.post a:before {
Expand All @@ -272,7 +266,7 @@ pre {
bottom: 0;
left: 0;
right: 0;
transition: all var(--base-trans) ease-in-out;
@extend %transition-base;
}

.post a:hover:before {
Expand Down Expand Up @@ -312,8 +306,8 @@ pre {
display: none;
}

.post a:hover {
color: var(--brand-color);
.post a {
@extend %hover-brand-color;
}

.post ol li {
Expand Down Expand Up @@ -426,7 +420,7 @@ pre {
padding: 1.6rem 0;
overflow: hidden;
text-overflow: ellipsis;
transition: all var(--base-trans-mid) ease-in-out;
@extend %transition-mid;
}

.blog-list-item a:before {
Expand Down
12 changes: 8 additions & 4 deletions assets/js/s.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,15 @@

// HELPERS

// HELPERS: scrolling function from A -> B (modified from: https://bit.ly/2H3JKMV)
// Get current time in milliseconds
function getCurrentTime() {
return "now" in window.performance ? performance.now() : new Date().getTime();
}

// scrolling function from A -> B (modified from: https://bit.ly/2H3JKMV)
function scrollToItem(destination, duration = 500, extraPadding) {
const start = window.pageYOffset;
const startTime = "now" in window.performance ? performance.now() : new Date().getTime();
const startTime = getCurrentTime();

const documentHeight = Math.max(
document.body.scrollHeight,
Expand Down Expand Up @@ -71,8 +76,7 @@
}

function scroll() {
const now =
"now" in window.performance ? performance.now() : new Date().getTime();
const now = getCurrentTime();

const time = Math.min(1, (now - startTime) / duration);
const timeFunction = 0.5 * (1 - Math.cos(Math.PI * time));
Expand Down