diff --git a/assets/sass/anchorlink.scss b/assets/sass/anchorlink.scss index 09f1649c..b737c11f 100644 --- a/assets/sass/anchorlink.scss +++ b/assets/sass/anchorlink.scss @@ -3,6 +3,18 @@ flex-wrap: wrap; } +.a-anchorlink::before { + content: ""; + display: block; + width: 100%; + margin: 2rem 0; + background-image: url("/intersector.svg"); + background-position: center; + background-repeat: no-repeat; + height: 2.4rem; + opacity: 50%; +} + .a-anchorlink__link { display: inline-flex; width: 3.2rem; @@ -12,6 +24,7 @@ margin-left: .8rem; border-radius: var(--border-radius-s); opacity: .8; + text-decoration: none; &:hover, &:focus { diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss index 69a95c4a..2d2ec865 100644 --- a/assets/sass/expander.scss +++ b/assets/sass/expander.scss @@ -34,18 +34,17 @@ details > summary::-webkit-details-marker { } summary::before { - content: url($icon-add); - font-weight: normal; - width: 2.4rem; - height: 2.4rem; - margin-right: .8rem; - text-decoration: none; + content: "add"; position: absolute; left: 1.2rem; + font-size: 2.4rem; + @extend .material-symbols-rounded } details[open] > summary::before { - content: url($icon-remove); + content: "remove"; + font-size: 2.4rem; + @extend .material-symbols-rounded } details[open] > summary { diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss index 08cf0d18..a361cc10 100644 --- a/assets/sass/fonts.scss +++ b/assets/sass/fonts.scss @@ -1,17 +1,71 @@ +/* roboto-latin-100-normal */ @font-face { - font-family: "Roboto"; + font-family: 'Roboto'; font-style: normal; - font-weight: 100 700; - src: url(/fonts/Roboto-VariableFont_wdth,wght.ttf) format('woff2'); font-display: swap; + font-weight: 100; + src: url(@fontsource/roboto/files/roboto-latin-100-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-100-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+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; } +/* roboto-latin-400-normal */ @font-face { - font-family: "Roboto"; + font-family: 'Roboto'; + font-style: normal; + font-display: swap; + font-weight: 400; + src: url(@fontsource/roboto/files/roboto-latin-400-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-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+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + +/* roboto-latin-700-normal */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-display: swap; + font-weight: 700; + src: url(@fontsource/roboto/files/roboto-latin-700-normal.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-700-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+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + +/* roboto-latin-100-italic */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-display: swap; + font-weight: 100; + src: url(@fontsource/roboto/files/roboto-latin-100-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-100-italic.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+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + +/* roboto-latin-400-italic */ +@font-face { + font-family: 'Roboto'; font-style: italic; - font-weight: 100 700; - src: url(/fonts/Roboto-Italic-VariableFont_wdth,wght.ttf) format('woff2'); font-display: swap; + font-weight: 400; + src: url(@fontsource/roboto/files/roboto-latin-400-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-400-italic.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+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + +/* roboto-latin-700-italic */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-display: swap; + font-weight: 700; + src: url(@fontsource/roboto/files/roboto-latin-700-italic.woff2) format('woff2'), url(@fontsource/roboto/files/roboto-latin-700-italic.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+20AC,U+2122,U+2191,U+2193,U+2212,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 { @@ -19,3 +73,19 @@ body { word-wrap: break-word; hyphens: auto; } + +.material-symbols-rounded { + font-family: "Material Symbols Rounded"; + font-weight: normal; + font-style: normal; + display: inline-block; + font-size: 20px; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + vertical-align: text-bottom; + text-decoration: none; +} diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 8056e0c8..b31c2dbe 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -1,6 +1,3 @@ -$icon-add: '{{(resources.Get "svg/default/add.svg" | fingerprint "md5").RelPermalink}}'; -$icon-remove: '{{(resources.Get "svg/default/remove.svg" | fingerprint "md5").RelPermalink}}'; - @import "_variables.scss"; @import "node_modules/bootstrap/scss/bootstrap.scss"; @import "styles.scss"; diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 17fb3e89..edeb7f9d 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -137,11 +137,12 @@ } } -.o-header__expand-button svg, -.o-nav__menu-button svg, -.o-nav__close-button svg { +.o-header__expand-button > .material-symbols-rounded, +.o-nav__menu-button > .material-symbols-rounded, +.o-nav__close-button > .material-symbols-rounded { margin-left: .8rem; align-self: center; + text-decoration: none; } .o-header__expand-button:has(~ .o-header__item-countries--open) svg { diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index f3433229..6ea1e77a 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -167,16 +167,4 @@ img { padding: 2rem; border-radius: var(--border-radius-l); margin-bottom: 2.4rem; - - .content span:not(:first-of-type)::before { - content: ""; - display: block; - width: 100%; - margin: 2rem 0; - background-image: url("/intersector.svg"); - background-position: center; - background-repeat: no-repeat; - height: 2.4rem; - opacity: 50%; - } } diff --git a/assets/svg/default/add.svg b/assets/svg/default/add.svg deleted file mode 100644 index 1dc52b45..00000000 --- a/assets/svg/default/add.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/arrow_back.svg b/assets/svg/default/arrow_back.svg deleted file mode 100644 index ed7b0af5..00000000 --- a/assets/svg/default/arrow_back.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/arrow_outward.svg b/assets/svg/default/arrow_outward.svg deleted file mode 100644 index cf5055c0..00000000 --- a/assets/svg/default/arrow_outward.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/close.svg b/assets/svg/default/close.svg deleted file mode 100644 index 7ef73bf9..00000000 --- a/assets/svg/default/close.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/edit_square.svg b/assets/svg/default/edit_square.svg deleted file mode 100644 index d8efa046..00000000 --- a/assets/svg/default/edit_square.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/keyboard_arrow_down.svg b/assets/svg/default/keyboard_arrow_down.svg deleted file mode 100644 index 17003d30..00000000 --- a/assets/svg/default/keyboard_arrow_down.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/link.svg b/assets/svg/default/link.svg deleted file mode 100644 index 018d2952..00000000 --- a/assets/svg/default/link.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/list.svg b/assets/svg/default/list.svg deleted file mode 100644 index 7b7d8272..00000000 --- a/assets/svg/default/list.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/menu.svg b/assets/svg/default/menu.svg deleted file mode 100644 index 6c01b5e8..00000000 --- a/assets/svg/default/menu.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/remove.svg b/assets/svg/default/remove.svg deleted file mode 100644 index 0efb6af1..00000000 --- a/assets/svg/default/remove.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/svg/default/view_cozy.svg b/assets/svg/default/view_cozy.svg deleted file mode 100644 index c03c2e68..00000000 --- a/assets/svg/default/view_cozy.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/hugo.yaml b/hugo.yaml index b90a9484..5d63bf90 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -23,6 +23,8 @@ module: target: "assets" - source: "static" target: "static" + - source: "node_modules/@fontsource" + target: "static/css/@fontsource" related: includeNewer: true diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index 969809a4..7406c721 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,6 +1,6 @@ {{- $url := .Destination -}} {{- if strings.HasPrefix $url "http" -}} -{{ .Text }}{{ partial "ico" (dict "icon" "arrow_outward" ) }} +{{ .Text }}{{ partial "icon" "arrow_outward" }} {{- else -}} {{ .Text }} {{- end -}} diff --git a/layouts/country/single.html b/layouts/country/single.html index c3fb6117..81da7e77 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -22,7 +22,7 @@

{{ .Title }}

{{- with .Content -}} - {{ . | replaceRE "()" (print `${1}${3}` (partial "ico" (dict "icon" "link")) ``) | safeHTML }} + {{ . | replaceRE "()" (print `${1}${3}` (partial "icon" "link") ``) | safeHTML }} {{- end -}}
diff --git a/layouts/operator/single.html b/layouts/operator/single.html index b9c898b7..2772de7d 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -20,7 +20,7 @@

{{ .Title }}

{{- with .Content -}} - {{ . | replaceRE "()" (print `${1}${3}` (partial "ico" (dict "icon" "link")) ``) | safeHTML }} + {{ . | replaceRE "()" (print `${1}${3}` (partial "icon" "link") ``) | safeHTML }} {{- end -}}
diff --git a/layouts/partials/icon.html b/layouts/partials/icon.html new file mode 100644 index 00000000..222c6121 --- /dev/null +++ b/layouts/partials/icon.html @@ -0,0 +1 @@ + diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index cab31258..720dddc6 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -10,18 +10,18 @@

FIP Guide