diff --git a/Dockerfile b/Dockerfile index d15406de..01aefa2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG NVM_VERSION LABEL maintainer=ai-validatie@minbzk.nl \ organization=MinBZK \ license=EUPL-1.2 \ - org.opencontainers.image.description="Transparency of Algorithmic Decision making" \ + org.opencontainers.image.description="Algoritm Management Toolkit" \ org.opencontainers.image.source=https://github.com/MinBZK/amt \ org.opencontainers.image.licenses=EUPL-1.2 diff --git a/amt/site/static/fonts/ROsanswebtextbold.woff b/amt/site/static/fonts/ROsanswebtextbold.woff deleted file mode 100644 index 6f0e3c81..00000000 Binary files a/amt/site/static/fonts/ROsanswebtextbold.woff and /dev/null differ diff --git a/amt/site/static/fonts/ROsanswebtextitalic.woff b/amt/site/static/fonts/ROsanswebtextitalic.woff deleted file mode 100644 index 7e74d669..00000000 Binary files a/amt/site/static/fonts/ROsanswebtextitalic.woff and /dev/null differ diff --git a/amt/site/static/fonts/ROsanswebtextregular.woff b/amt/site/static/fonts/ROsanswebtextregular.woff deleted file mode 100644 index 624c3f89..00000000 Binary files a/amt/site/static/fonts/ROsanswebtextregular.woff and /dev/null differ diff --git a/amt/site/static/images/logo.svg b/amt/site/static/images/logo.svg deleted file mode 100644 index f7cfde29..00000000 --- a/amt/site/static/images/logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/amt/site/static/scss/layout.scss b/amt/site/static/scss/layout.scss index d599ab17..8535dda5 100644 --- a/amt/site/static/scss/layout.scss +++ b/amt/site/static/scss/layout.scss @@ -1,24 +1,3 @@ -@font-face { - font-family: "Rijksoverheid Sans"; - src: url("../fonts/ROsanswebtextregular.woff") format("opentype"); - font-style: normal; - font-weight: 400; -} - -@font-face { - font-family: "Rijksoverheid Sans"; - src: url("../fonts/ROsanswebtextitalic.woff") format("opentype"); - font-style: italic; - font-weight: 400; -} - -@font-face { - font-family: "Rijksoverheid Sans"; - src: url("../fonts/ROsanswebtextbold.woff") format("opentype"); - font-weight: 700; - font-style: normal; -} - :root { --clr-neutral-800: hsl(234deg 29% 20%); --clr-neutral-700: hsl(235deg 18% 26%); @@ -27,7 +6,7 @@ --clr-accent-600: hsl(211deg 69% 27%); --clr-accent-400: hsl(203deg 100% 39%); --clr-accent-200: hsl(203deg 63.8% 81.6%); - --ff-base: "Rijksoverheid Sans", sans-serif; + --ff-base: "RijksoverheidSansWebText", sans-serif; --fw-regular: 400; --fw-bold: 700; --fs-300: 0.825rem; @@ -62,42 +41,6 @@ main { margin-inline: clamp(1rem, 2vw, 4rem); } -footer { - margin-block-start: 2em; - border-block-start-color: var(--clr-accent-200); - border-block-start-style: solid; - border-block-start-width: 0.5rem; - background-color: hsl(203deg 100% 39%); - height: 2rem; -} - -.header { - margin-bottom: 2em; - border-bottom-color: var(--clr-accent-200); - border-bottom-style: solid; - border-bottom-width: 0.5em; -} - -.header a { - color: inherit; - text-decoration: none; -} - -.header-top { - padding-inline: 0.75em; - padding-block: 0.5em; - color: var(--clr-accent-600); - font-size: 1.125em; - line-height: 1.5em; - white-space: nowrap; -} - -.header-logo-image { - aspect-ratio: 1 / 1; - max-width: 180px; - display: block; -} - .language-selection { margin-inline-end: clamp(1rem, 2vw, 4rem); } @@ -108,42 +51,6 @@ footer { color: inherit; } -.header-nav { - background-color: var(--clr-accent-400); - height: 50px; - color: var(--clr-neutral-100); - text-decoration: none; - display: flex; - gap: clamp(0.1rem, 1vw, 2rem); - justify-content: flex-end; -} - -.header-nav > div { - align-self: center; -} - -.header-nav a { - border-block-end: 0.1em solid; - border-block-end-color: var(--clr-accent-200); - border-block-end-style: dashed; - padding-block: 0.2em; -} - -.header-nav a:hover { - color: var(--clr-accent-600); - background-color: var(--clr-accent-200); - flex-grow: 1; - border-width: 1.25em; - border-radius: 0.5em; -} - -.header-nav-container ul { - display: flex; - justify-content: space-between; - align-items: center; - gap: clamp(1rem, 2vw, 4rem); -} - .margin-bottom-large { margin-bottom: 1em; } diff --git a/amt/site/templates/footer.html.j2 b/amt/site/templates/footer.html.j2 index 5e0ea021..c641a1fb 100644 --- a/amt/site/templates/footer.html.j2 +++ b/amt/site/templates/footer.html.j2 @@ -1,2 +1,60 @@ - +
diff --git a/amt/site/templates/header.html.j2 b/amt/site/templates/header.html.j2 index e8a9f64d..858e5a27 100644 --- a/amt/site/templates/header.html.j2 +++ b/amt/site/templates/header.html.j2 @@ -1,26 +1,60 @@