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
2 changes: 1 addition & 1 deletion assets/js/darkmode.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
label = button.dataset.switchToAuto;
}

const iconElement = button.querySelector(".material-symbols-rounded");
const iconElement = button.querySelector(".a-icon");
if (iconElement) {
iconElement.dataset.icon = icon;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
font-size: 1.3rem;
}

.o-last-updated > .material-symbols-rounded::before {
.o-last-updated > .a-icon {
font-size: 1.5rem;
}

Expand Down
23 changes: 15 additions & 8 deletions assets/sass/contentNavigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
@media print {
display: none;
}

.a-icon {
font-size: 1.2em;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the icon is smaller than before, it should be 20x20px

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the general size increase, it's now 17x17 vs 18x18 on my side. I do think it looks slightly better with the alignment:

Before:
grafik

After:
grafik

If you like the previous icon more, I can increase the font-size to 1.25em, then it's ~18px on my side again.

}
}

.o-aside__header {
Expand All @@ -49,9 +53,9 @@

@include focus-indicator(0.1rem);

> .material-symbols-rounded {
> .a-icon {
align-self: flex-start;
margin-top: 0.1rem;
margin-top: 0.3rem;
}
}

Expand Down Expand Up @@ -108,19 +112,22 @@
padding-left: 0;
}

&-date {
padding-left: 2.5rem;
&__date {
margin-left: 2.5rem;
position: relative;
top: -0.2rem;
}

p {
margin-bottom: 0;
}
}

.o-related__item figure {
border-radius: var(--border-radius-s);
&__item {
figure {
border-radius: var(--border-radius-s);
}
}
}

@media (max-width: #{$breakpoint-lg}) {
.o-aside {
position: fixed;
Expand Down
7 changes: 3 additions & 4 deletions assets/sass/dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
color: var(--link-hovered);
transition: color 0.3s ease;

& > :not(.material-symbols-rounded) {
& > :not(.a-icon) {
text-decoration: underline;
}
}
Expand All @@ -49,7 +49,7 @@
display: grid;
}

&__button[aria-expanded="true"] &__icon {
&__button[aria-expanded="true"] .o-dropdown__icon .a-icon {
transform: rotate(180deg);
}

Expand Down Expand Up @@ -105,8 +105,7 @@
}
}

&__icon {
font-size: 0.7rem;
.o-dropdown__icon .a-icon {
transition: transform 0.2s;
}

Expand Down
4 changes: 2 additions & 2 deletions assets/sass/expander.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
}

> .material-symbols-rounded {
> .a-icon {
transition: transform 0.2s;

@media print {
Expand Down Expand Up @@ -133,7 +133,7 @@ details {
}
}

details[open] > .o-expander__summary > .material-symbols-rounded {
details[open] > .o-expander__summary > .a-icon {
transform: rotate(180deg);
}

Expand Down
35 changes: 5 additions & 30 deletions assets/sass/fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,46 +104,21 @@
U+2215, U+FEFF, U+FFFD;
}

/* material-symbols-rounded-latin-400-normal */
@font-face {
font-family: "Material Symbols Rounded";
font-style: normal;
font-display: swap;
font-weight: 400;
src:
url(@fontsource/material-symbols-rounded/files/material-symbols-rounded-latin-400-normal.woff2)
format("woff2"),
url(@fontsource/material-symbols-rounded/files/material-symbols-rounded-latin-400-normal.woff)
format("woff");
unicode-range:
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC,
U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
U+2212, U+2215, U+FEFF, U+FFFD;
}

body,
button {
font-family: "Roboto", Arial, Helvetica, sans-serif;
word-wrap: break-word;
hyphens: auto;
}

.material-symbols-rounded::before {
content: attr(data-icon);
font-family: "Material Symbols Rounded";
font-weight: normal;
font-style: normal;
.a-icon {
display: inline-block;
font-size: 2rem;
width: 1.125em;
height: 1.125em;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;
vertical-align: text-bottom;
text-decoration: none;
width: 1em;
height: 1em;
user-select: none;
background-color: currentColor;
mask: var(--icon-url) no-repeat center / contain;
}
8 changes: 6 additions & 2 deletions assets/sass/navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ menu > li > menu {

&:hover,
&:focus {
:not(.material-symbols-rounded) {
:not(.a-icon) {
text-decoration: underline;
}
color: var(--link-hovered);
Expand All @@ -150,7 +150,7 @@ menu > li > menu {
display: none;
}

> .material-symbols-rounded {
> .a-icon {
margin-left: 0.8rem;
align-self: center;
text-decoration: none;
Expand Down Expand Up @@ -233,6 +233,10 @@ menu > li > menu {
&:hover {
color: var(--link-hovered);
}

> .a-icon {
font-size: 1.15em;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the icon is larger than before, it should be 20x20px

}
}

body:has(.o-header__nav--open) {
Expand Down
21 changes: 15 additions & 6 deletions assets/sass/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@ $search-z-index-focus: 12;
position: relative;

&::before {
content: "search";
content: "";
display: block;
position: absolute;
top: 23px;
top: 22px;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
top: 22px;
top: 20px;

left: 20px;
z-index: $search-z-index + 1;
font-family: "Material Symbols Rounded";
width: 2.4rem;
height: 2.4rem;
background-color: currentColor;
mask: url("/icons/material-symbols-rounded/search.svg") no-repeat
center / contain;
opacity: 0.7;
pointer-events: none;
line-height: 1;
}
}

Expand Down Expand Up @@ -148,8 +152,13 @@ $search-z-index-focus: 12;
}

.pagefind-ui__result-link::before {
content: "subdirectory_arrow_right";
font-family: "Material Symbols Rounded";
content: "";
display: block;
width: 1.8rem;
height: 1.8rem;
background-color: currentColor;
mask: url("/icons/material-symbols-rounded/subdirectory_arrow_right.svg")
no-repeat center / contain;
position: absolute;
left: -2.4rem;
Comment on lines +155 to 163
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The icons are a little too high up. We should add:
top: 0;

}
Expand Down
4 changes: 4 additions & 0 deletions assets/sass/startpage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
gap: 2rem;
margin-bottom: 2rem;

@media (max-width: #{$breakpoint-xl}) {
grid-template-columns: 1fr 1fr 1fr 1fr 2fr;
}

@media (max-width: #{$breakpoint-lg}) {
display: flex;
gap: 1rem;
Expand Down
10 changes: 3 additions & 7 deletions assets/sass/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ a,
text-decoration: none;
color: var(--bs-body-color);

> .material-symbols-rounded {
> .a-icon {
display: none;
}
}

& > .material-symbols-rounded {
& > .a-icon {
margin: 0 0.2rem;
}
}
Expand Down Expand Up @@ -205,10 +205,6 @@ figure {
}
}

.o-related__date {
margin-left: 2.4rem;
}

.o-list__list {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
Expand Down Expand Up @@ -439,7 +435,7 @@ details > summary {

.o-link__mail,
.o-link__tel {
& > .material-symbols-rounded {
& > .a-icon {
margin-right: 0.4rem;
}
}
6 changes: 3 additions & 3 deletions assets/sass/teaser.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

@include focus-indicator(0.3rem);

.material-symbols-rounded::before {
font-size: 2.4rem;
.a-icon {
font-size: 2rem;
margin-top: 1rem;
}

Expand Down Expand Up @@ -110,7 +110,7 @@
flex-direction: column;
justify-content: space-between;

> .material-symbols-rounded {
> .a-icon {
@media print {
display: none;
}
Expand Down
2 changes: 2 additions & 0 deletions hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ module:
target: "static"
- source: "node_modules/@fontsource"
target: "static/css/@fontsource"
- source: "node_modules/@material-symbols/svg-700/rounded"
target: "static/icons/material-symbols-rounded"

related:
includeNewer: true
Expand Down
3 changes: 1 addition & 2 deletions layouts/_default/rss.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<item>
<title>{{ .Title }}</title>
<link>{{ .Permalink }}</link>
<!-- Remove the icons and XML escape the summary -->
{{ $cleanedHTML := partial "strip-material-icons" .Summary | transform.XMLEscape | safeHTML}}
{{ $cleanedHTML := .Summary | plainify | transform.XMLEscape | safeHTML }}
<description>{{ $cleanedHTML }}</description>
<pubDate>{{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
<enclosure url="{{ (partial "helper/contentImage" . ).Permalink }}" />
Expand Down
6 changes: 3 additions & 3 deletions layouts/news/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ <h3 id="o-related__title">{{ T "news.further" }}</h3>
)
}}
{{ if eq .Page.Type "news" }}
<span class="o-related__date"
>{{ .Date | time.Format ":date_long" }}</span
>
<span class="o-related__date">
{{ .Date | time.Format ":date_long" }}
</span>
{{ end }}
</li>
{{ end }}
Expand Down
3 changes: 2 additions & 1 deletion layouts/partials/icon.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<span
data-pagefind-ignore="all"
class="material-symbols-rounded"
class="a-icon"
translate="no"
aria-hidden="true"
data-icon="{{ . }}"
style="--icon-url: url('/icons/material-symbols-rounded/{{ . }}.svg');"
></span>
{{- /* Needed, otherwise links break: https://github.com/fipguide/fipguide.github.io/issues/116 */ -}}
1 change: 0 additions & 1 deletion layouts/partials/strip-material-icons.html

This file was deleted.

2 changes: 1 addition & 1 deletion layouts/partials/teaser.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h3 class="m-teaser__headline">{{ $page.Title }}</h3>


<div class="m-teaser__text">
{{ partial "strip-material-icons" $page.Summary | plainify | truncate 500 }}
{{ $page.Summary | plainify | truncate 500 }}
</div>
{{- partial "icon" "arrow_forward" -}}
</div>
Expand Down
Loading
Loading