Merge 70f6749c92 into 13aa6e83ae

Signed-off-by: famfo <famfo@famfo.xyz>

assets/js/versions.template.js

@@ -44,10 +44,10 @@ function appendVersion(parent, name, segment, url) {
     // The list item
     const li = document.createElement("li");
     if (segment === selected) {
-        li.classList.add("selected");
+        li.classList.add("version-picker-selected");
     }
     if (segment === "latest") {
-        li.classList.add("latest");
+        li.classList.add("version-picker-latest");
     }
     parent.appendChild(li);
 

assets/scss/_styles_project.scss

@@ -57,18 +57,13 @@ Custom SCSS for the Matrix spec
     overflow-y: auto;
   }
 
-  /* As these styles are only applied by JavaScript, PurgeCSS doesn't see them
-   * in the source code and removes them unless we explicitly tell it not to.
-   */
-  /* purgecss start ignore */
-  ul#version-selector li.selected a {
+  ul#version-selector li.version-picker-selected a {
     font-weight: bold;
   }
 
-  ul#version-selector li.latest a {
+  ul#version-selector li.version-picker-latest a {
     color: $secondary;
   }
-  /* purgecss end ignore */
 }
 
 /* Styles for the sidebar nav */

changelogs/internal/newsfragments/2264.clarification

@@ -0,0 +1 @@
+Add version picker in the navbar.

changelogs/server_server/newsfragments/2191.clarification

@@ -0,0 +1 @@
+Clarify what the minimum_valid_until_ts field means when it is set in key queries.

data/api/server-server/keys_query.yaml

@@ -34,8 +34,8 @@ paths:
         - in: query
           name: minimum_valid_until_ts
           description: |-
-            A millisecond POSIX timestamp in milliseconds indicating when the returned
-            certificates will need to be valid until to be useful to the requesting server.
+            A millisecond POSIX timestamp. The returned keys MUST be valid
+            until at least this timestamp.
 
             If not supplied, the current time as determined by the notary server is used.
           required: false
@@ -98,9 +98,8 @@ paths:
                           type: integer
                           format: int64
                           description: |-
-                            A millisecond POSIX timestamp in milliseconds indicating when
-                            the returned certificates will need to be valid until to be
-                            useful to the requesting server.
+                            A millisecond POSIX timestamp. The returned keys
+                            MUST be valid until at least this timestamp.
 
                             If not supplied, the current time as determined by the notary
                             server is used.

postcss.config.js

@@ -16,6 +16,9 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
             extensions: ["json"],
         },
     ],
+    // As these classes are only applied by JavaScript, PurgeCSS doesn't see them
+    // in the source code and removes them unless we explicitly tell it not to.
+    safelist: ['version-picker-selected', 'version-picker-latest']
 });
 
 module.exports = {