Compare commits

...

6 Commits

Author SHA1 Message Date
7c40b754db Update matrix user 2024-08-19 12:43:16 -05:00
4a476a0207 Prevent layout shift 2024-08-13 23:07:16 -05:00
21377ff19f Ensure text visibility while fonts load 2024-08-13 22:47:47 -05:00
092c806226 Fix active page li color 2024-08-13 22:46:19 -05:00
c5121f01ca Fix accessibility issue
Fix <li> inside <a> so screenreader can parse nav
2024-08-13 22:34:00 -05:00
d64b6e15cd Merge pull request 'Blah' (#3) from responsive-images into main
Reviewed-on: #3
2024-08-13 22:58:26 -04:00
4 changed files with 23 additions and 32 deletions

View File

@@ -38,7 +38,7 @@ export default {
}, },
{ {
title: "Matrix", title: "Matrix",
linkURL: "https://matrix.to/#/@nathanu:matrix.org", linkURL: "https://matrix.to/#/@nathan:upchur.ch",
linkDisplay: "Matrix", linkDisplay: "Matrix",
iconURL: "/img/matrix-org.svg" iconURL: "/img/matrix-org.svg"
}, },

View File

@@ -2,14 +2,9 @@
<h2 class="visually-hidden">Top level navigation menu</h2> <h2 class="visually-hidden">Top level navigation menu</h2>
<ul class="nav"> <ul class="nav">
{%- for entry in collections.all | eleventyNavigation %} {%- for entry in collections.all | eleventyNavigation %}
<a class="nav-item" href="{{ entry.url }}"{% if entry.url == page.url %} aria-current="page" data-currentpage="true"{% endif %}> <li class="nav-item" {% if entry.url == page.url %} aria-current="page" data-currentpage="true"{% endif %}><a href="{{ entry.url }}">{{ entry.title }}</a></li>
<li>{{ entry.title }}</li>
</a>
{%- endfor %} {%- endfor %}
<a class="nav-item" href="/feed/feed.xml"> <li class="subscribe nav-item"><a href="/feed/feed.xml">{% include "rssLogo.njk" %}Feed</a>
<li class="subscribe">
{% include "rssLogo.njk" %}Feed
</li> </li>
</a>
</ul> </ul>
</nav> </nav>

View File

@@ -492,13 +492,8 @@ nav ul {
width: var(--space-2xs); width: var(--space-2xs);
} }
.nav-item { .nav-item {
display: inline-block;
text-decoration: none;
border-top: var(--border-nav);
}
.nav-item li {
align-items: baseline; align-items: baseline;
color: var(--text-color); border-top: var(--border-nav);
display: flex; display: flex;
font-size: var(--step--2); font-size: var(--step--2);
font-variation-settings: var(--font-variation-ui); font-variation-settings: var(--font-variation-ui);
@@ -509,37 +504,33 @@ nav ul {
transition: var(--transition-normal); transition: var(--transition-normal);
letter-spacing: var(--ui-letter-spacing); letter-spacing: var(--ui-letter-spacing);
} }
.nav-item:hover { .nav-item a {
border-top: var(--border-nav-hover); color: var(--text-color);
margin-top: calc(var(--space-xs-s) * -1); /* Compensate for padding */
padding-top: var(--space-xs-s); /* Give <a> a larger click area */
} }
/* Compensate for increased border thickness on hover of a.nav-item */ .nav-item:hover {
.nav-item:hover li { border-top: var(--border-nav-hover); /* Increase border thickness */
margin-top: calc(var(--space-xs-s) * -1); }
.nav-item:hover a {
margin-top: calc(var(--space-xs-s) * -2); /* Compensate for border thickness */
} }
.nav-item a[href]:visited { .nav-item a[href]:visited {
color: var(--text-color); color: var(--text-color);
} }
.nav-item a[href]:hover { .nav-item:hover a[href] {
color: var(--text-color); color: var(--text-color);
text-decoration: none; text-decoration: none;
} }
.nav-item a[href]:not(:hover) { .nav-item a[href]:not(:hover) {
color: var(--text-color);
text-decoration: none; text-decoration: none;
} }
.nav-item[data-currentpage="true"] { .nav-item[data-currentpage="true"] {
border-top: var(--border-nav-currentpage); border-top: var(--border-nav-currentpage);
}
.nav-item[data-currentpage="true"] a, .nav-item[data-currentpage="true"] a[href]:visited, .nav-item[data-currentpage="true"]:hover a {
color: var(--contrast-color); color: var(--contrast-color);
} margin-top: calc(var(--space-xs-s) * -2); /* Compensate for border thickness */
.nav-item[data-currentpage="true"] li {
margin-top: calc(var(--space-xs-s) * -1);
}
.nav a[href][aria-current="page"] li {
color: var(--contrast-color);
}
.subscribe:hover {
color: var(--text-color);
} }
/* Posts list */ /* Posts list */
@@ -568,9 +559,11 @@ nav ul {
.post-image-container { .post-image-container {
border-radius: var(--border-radius); border-radius: var(--border-radius);
box-shadow: var(--box-shadow); box-shadow: var(--box-shadow);
height: 15rem;
margin-left: calc(var(--space-l) * -1); margin-left: calc(var(--space-l) * -1);
max-height: 15rem; max-height: 15rem;
overflow: hidden; overflow: hidden;
width: 15rem;
} }
.postlist-date, .postlist-date,

View File

@@ -1,16 +1,19 @@
@font-face { @font-face {
font-display: swap;
font-family: Manrope; font-family: Manrope;
font-style: normal; font-style: normal;
font-weight: 200 900; font-weight: 200 900;
src: url(/css/webfonts/Manrope[wght].woff2) format("woff2"); src: url(/css/webfonts/Manrope[wght].woff2) format("woff2");
} }
@font-face { @font-face {
font-display: swap;
font-family: Fraunces; font-family: Fraunces;
font-style: normal; font-style: normal;
font-weight: 100 900; font-weight: 100 900;
src: url(/css/webfonts/Fraunces[SOFT,WONK,opsz,wght].woff2) format("woff2"); src: url(/css/webfonts/Fraunces[SOFT,WONK,opsz,wght].woff2) format("woff2");
} }
@font-face { @font-face {
font-display: swap;
font-family: Fraunces; font-family: Fraunces;
font-style: italic; font-style: italic;
font-weight: 100 900; font-weight: 100 900;