Merge e4fc47ece1 into 8a2c58b1b1

Typo "not" -> "no" (#2121 )
* Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>
2026-04-17 00:24:10 +02:00 · 2025-03-28 16:31:19 -04:00 · 2025-03-28 14:13:17 +00:00 · 2025-02-22 12:32:11 +01:00 · 2025-02-22 12:14:56 +01:00 · 2025-02-22 12:14:56 +01:00
4 changed files with 22 additions and 8 deletions
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@ -316,13 +316,19 @@ Custom SCSS for the Matrix spec
  h2 {
    font-weight: $font-weight-bold;
    font-size: 1.3rem;
-    margin: 3rem 0 .5rem 0;
+    margin: 1.5rem 0 1rem 0;
  }

  h3 {
    font-weight: $font-weight-bold;
    font-size: 1.1rem;
-    margin: 1.5rem 0 .75rem 0;
+    margin: 1.5rem 0 1rem 0;
+
+  }
+
+  /* Reduce top margin of h3 if previous sibling is a h2 */
+  h2 + h3 {
+    margin-top: 1rem;
  }

  hr {
@ -367,11 +373,6 @@ Custom SCSS for the Matrix spec
      }
    }

-    // add some space between two tables when they are right next to each other
-    & + table {
-        margin-top: 4rem;
-    }
-
    caption {
      caption-side: top;
      color: $dark;
@ -443,6 +444,17 @@ Custom SCSS for the Matrix spec
    }
  }

+  /* Have consistent spacing around tables and examples */
+  table, .highlight {
+    margin-top: 0;
+    margin-bottom: 2rem;
+
+    /* We don't need the margin on the last child of the .rendered-data block */
+    &:last-child {
+      margin-bottom: 0;
+    } 
+  }
+
  pre {
    border: 0;
    border-left: solid 5px $secondary;
--- a/changelogs/client_server/newsfragments/2121.clarification
+++ b/changelogs/client_server/newsfragments/2121.clarification
@ -0,0 +1 @@
+Fix various typos throughout the specification.
--- a/changelogs/internal/newsfragments/2081.clarification
+++ b/changelogs/internal/newsfragments/2081.clarification
@ -0,0 +1 @@
+Adjust margins in rendered endpoints.
--- a/content/client-server-api/modules/secrets.md
+++ b/content/client-server-api/modules/secrets.md
@ -58,7 +58,7 @@ available on all their clients. Unless the user specifies otherwise,
 clients will try to use the default key to decrypt secrets.

 Clients that want to present a simplified interface to users by not supporting
-multiple keys should use the default key if one is specified. If not default
+multiple keys should use the default key if one is specified. If no default
 key is specified, the client may behave as if there is no key is present at
 all. When such a client creates a key, it should mark that key as being the
 default key.
Author	SHA1	Message	Date
Kévin Commaille	c689ebf9d9	Merge `e4fc47ece1` into `8a2c58b1b1`	2025-03-28 16:31:19 -04:00
Andy Balaam	8a2c58b1b1	Typo "not" -> "no" (#2121 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details * Typo "not" -> "no" Signed-off-by: Andy Balaam <andy.balaam@matrix.org> --------- Signed-off-by: Andy Balaam <andy.balaam@matrix.org>	2025-03-28 14:13:17 +00:00
Kévin Commaille	e4fc47ece1	Add changelog Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-02-22 12:32:11 +01:00
Kévin Commaille	86b6330bc7	Adjust spacing around h2 and h3 titles in `.rendered-data` Given that h2 titles are always preceded by an horizontal rule, we don't need a lot of space to separate them from the previous section. We also reduce the spacing when a h2 title is followed directly by a h3 title. Finally, we add a little spacing below both so that tables are less close to the title. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-02-22 12:14:56 +01:00
Kévin Commaille	95a585f663	Use consistent spacing between tables and code blocks Tables used `4 rem` which is more than the margin above a h2 title, which seems excessive. We change it to `2 rem` which matches the margin of code blocks and info boxes. We also remove the margin on the last item of a `.rendered-data` block because this is just wasted space. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>	2025-02-22 12:14:56 +01:00
				`@ -0,0 +1 @@`
				`Fix various typos throughout the specification.`