Skip to content

Refactor duplicated code across HTML layouts, CSS, and JavaScript #92

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
Copilot wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Refactor duplicated code across HTML layouts, CSS, and JavaScript #92

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
74ede76
Initial plan
Copilot Oct 24, 2025
e337ee5
Refactor HTML layout duplication and extract meta tags into reusable …
Copilot Oct 24, 2025
e748de1
Create transition mixins to reduce CSS duplication
Copilot Oct 24, 2025
7253665
Remove duplicate time calculation and outdated vendor prefixes
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
14 changes: 1 addition & 13 deletions _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
{% seo %}

<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="{{ site.twitter }}">
<meta name="twitter:creator" content="{{ site.twitter }}">
<meta property="og:url" content="{{ site.url }}" />
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ site.title }}" />
<meta property="og:description"
content="Personal website of Adrián Mato. Designing and building AI tools for developers at GitHub" />
<meta property="og:image" content="{{" /assets/og-image.png" | absolute_url }}" />
<meta property="og:image:alt" content="{{ site.title }}" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="600" />
<meta property="og:site_name" content="{{ site.url }}" />
{% include meta-tags.html %}

<link rel="preload" as="style" href="{{ " /assets/css/style.css" | relative_url }}">
<link rel="stylesheet" href="{{ " /assets/css/style.css" | relative_url }}">
Expand Down
12 changes: 12 additions & 0 deletions _includes/meta-tags.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="{{ site.twitter }}">
<meta name="twitter:creator" content="{{ site.twitter }}">
<meta property="og:url" content="{{ page.url | default: site.url | absolute_url }}" />
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ page.title | default: site.title }}" />
<meta property="og:description" content="{{ page.description | default: site.description | default: 'Personal website of Adrián Mato. Designing and building AI tools for developers at GitHub' }}" />
<meta property="og:image" content="{{ page.og_image | default: '/assets/og-image.png' | absolute_url }}" />
<meta property="og:image:alt" content="{{ page.title | default: site.title }}" />
<meta property="og:image:width" content="{{ page.og_image_width | default: '1200' }}" />
<meta property="og:image:height" content="{{ page.og_image_height | default: '600' }}" />
<meta property="og:site_name" content="{{ site.url }}" />
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 %} class="{{ page.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>
24 changes: 21 additions & 3 deletions _sass/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Reset some basic elements
*/
* { padding: 0; margin: 0; -moz-box-sizing: border-box; box-sizing: border-box; }
* { padding: 0; margin: 0; box-sizing: border-box; }

html {
font-size: 62.5%;
Expand Down Expand Up @@ -127,8 +127,7 @@ ul{
a {
color: var(--brand-color);
text-decoration: none;
-webkit-transition: none;
transition: none;
transition: none;

&:visited {
color: var(--brand-color);
Expand Down Expand Up @@ -176,3 +175,22 @@ a {
.h-bradius {
border-radius: .1rem;
}

/**
* Transition Mixins
*/
@mixin transition($speed: var(--base-trans)) {
transition: all $speed ease-in-out;
}

%transition-base {
@include transition(var(--base-trans));
}

%transition-mid {
@include transition(var(--base-trans-mid));
}

%transition-slow {
@include transition(var(--base-trans-slow));
}
12 changes: 6 additions & 6 deletions _sass/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pre {
text-decoration: none;
padding: 2rem 1.4rem;
position: relative;
transition: all var(--base-trans-slow) ease-in-out;
@extend %transition-slow;
}

.home-navigation a:hover {
Expand All @@ -114,7 +114,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 +189,7 @@ pre {
color: var(--title-color);
text-decoration: none;
outline: none;
transition: all var(--base-trans-slow) ease-in-out;
@extend %transition-slow;
}
}

Expand Down Expand Up @@ -262,7 +262,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 +272,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 @@ -426,7 +426,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
6 changes: 3 additions & 3 deletions assets/js/s.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
// HELPERS: 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 getTime = () => "now" in window.performance ? performance.now() : new Date().getTime();
const startTime = getTime();

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

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

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