Merge main & update to bikkelhart/internet-nl@7cb9a8d5

    git fetch bikkelhart
    git merge -X theirs internetnl/main
    git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations
    git checkout --no-overlay main -- interface/static/question@internet.nl_0x45028563.asc
    convert -resize 48x48 interface/static/favicon.{png,ico}
    git add interface/static/favicon.ico
    git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"

Author: bwbroersma

Changelog.md

@@ -20,7 +20,13 @@ _Compared to the latest 1.10 release._
 
 - ...
 
-## 1.10.1 (in progress)
+## 1.10.2
+
+- Added missing [CAA fields to API](https://github.com/internetstandards/Internet.nl/pull/1801).
+
+The API version is updated to 2.6.0 due to the new CAA fields.
+
+## 1.10.1
 
 - Fixed handling for [CAA with non-ascii characters](https://github.com/internetstandards/Internet.nl/pull/1788).
 - Fixed possible exception in [mail test prechecks](https://github.com/internetstandards/Internet.nl/pull/1787).

docker/cron-docker/periodic/15min/auto_update renamed to docker/cron-docker/periodic/5min/auto_update

@@ -5,6 +5,9 @@ RUN apk add --no-cache curl postgresql15 python3 py3-prometheus-client py3-reque
 # install cron tasks
 COPY docker/cron/periodic /etc/periodic/
 
+# add 5min to crontab
+RUN echo "*/5    *       *       *       *       run-parts /etc/periodic/5min" >> /etc/crontabs/root
+
 # create separate periodic config for cron-docker service
 RUN cp -r /etc/crontabs /etc/crontabs-docker
 RUN sed -i 's/periodic/periodic-docker/' /etc/crontabs-docker/root

docker/util.Dockerfile

@@ -12,11 +12,12 @@
     "@rollup/plugin-terser": "^0.4.4",
     "autoprefixer": "^10.4.20",
     "concurrently": "^8.2.2",
-    "cssnano": "^7.0.6",
+    "cssnano": "^7.0.7",
     "glob": "^11.0.2",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.5",
     "postcss-import": "^16.1.0",
     "postcss-preset-env": "^10.1.4",
+    "postcss-variable-compress": "^3.0.0",
     "rollup": "^4.40.2",
     "rollup-plugin-postcss": "^4.0.2",
     "stylelint": "^16.14.1",

frontend/package-lock.json

@@ -1,13 +1,16 @@
 export default {
   plugins: {
     "postcss-import": {},
-    "@csstools/postcss-cascade-layers": {},
+    "@csstools/postcss-cascade-layers": {
+      onImportLayerRule: "warn",
+    },
     autoprefixer: {},
     "postcss-preset-env": {
       features: {},
     },
     cssnano: {
       preset: "default",
     },
+    "postcss-variable-compress": {},
   },
 };

frontend/package.json

@@ -35,7 +35,6 @@ const chunks = {
     "src/js/base/header.js",
     "src/js/base/theme.js",
     "src/js/base/language-switch.js",
-    "src/js/base/detect-browser-font-size.js",
     "src/js/base/print.js",
     "src/js/lib/matomo.js",
   ],

frontend/postcss.config.js

@@ -204,6 +204,10 @@
     & button {
       height: 100%;
       width: 100%;
+
+      &:not(.active) {
+        padding: 0.75rem;
+      }
     }
   }
 

frontend/rollup.config.js

@@ -49,10 +49,7 @@
 
     a {
       display: inline;
-
-      &:hover {
-        text-decoration: underline;
-      }
+      text-decoration: underline;
     }
 
     &.probing::before {
@@ -119,6 +116,11 @@
       background-color: var(--error-color);
     }
 
+    &.info::before {
+      mask-image: url("/static/icons/info.svg");
+      background-color: var(--info-color);
+    }
+
     &.hidethis {
       display: none;
     }

frontend/src/css/knowledge-section.css

@@ -86,13 +86,12 @@
   }
 
   form {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
+    display: grid;
 
     @media (width >= 56.25rem) {
-      flex-direction: row;
-      gap: 1.5rem;
+      column-gap: 1.5rem;
+      row-gap: 0.5rem;
+      grid-template-columns: repeat(2, 1fr);
     }
   }
 
@@ -105,8 +104,8 @@
     padding-bottom: 1rem;
 
     @media (width >= 56.25rem) {
-      width: 50%;
       padding-bottom: 0;
+      grid-column: 1 / 2;
     }
   }
 
@@ -120,17 +119,28 @@
     min-height: 3.25rem;
 
     &::placeholder {
-      color: var(--card-body-color-test);
+      color: var(--placeholder-color);
+      opacity: 1;
     }
   }
 
   button {
     padding: 0.625rem 1rem;
 
     @media (width >= 56.25rem) {
-      width: 50%;
       align-self: end;
-      height: fit-content;
+      grid-column: 2 / 3;
+      grid-row: 1 / 2;
+    }
+  }
+
+  .invalid-domain {
+    color: var(--warning-color);
+    font: var(--card-body-m);
+    padding-bottom: 1rem;
+
+    @media (width >= 56.25rem) {
+      padding-block: 0.5rem 0;
     }
   }
 
@@ -200,6 +210,10 @@
   }
 
   &.connection-variant {
+    form {
+      display: flex;
+    }
+
     .button-container {
       width: auto;
     }