Merge e4fc47ece1 into cb6d039c57

Normalize changelog
Add changelog
2026-03-03 10:14:10 +01:00 · 2025-03-27 12:34:28 +00:00 · 2025-03-25 15:40:04 -06: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
5 changed files with 23 additions and 11 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/2051.clarification
+++ b/changelogs/client_server/newsfragments/2051.clarification
@ -1,2 +1 @@
-Document the `instance_id` field of `Protocol Instance` in the responses to
-`GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`.
+Document the `instance_id` field of `Protocol Instance` in the responses to `GET /_matrix/client/v3/thirdparty/protocols` and `GET /_matrix/client/v3/thirdparty/protocol/{protocol}`.
--- a/changelogs/client_server/newsfragments/2059.removal
+++ b/changelogs/client_server/newsfragments/2059.removal
@ -1 +1 @@
-Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).
+Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}`, as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).
--- a/changelogs/client_server/newsfragments/2093.new
+++ b/changelogs/client_server/newsfragments/2093.new
@ -1 +1 @@
-Add `POST /_matrix/client/v3/users/{userId}/report` as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260).
+Add `POST /_matrix/client/v3/users/{userId}/report`, as per [MSC4260](https://github.com/matrix-org/matrix-spec-proposals/pull/4260).
--- a/changelogs/internal/newsfragments/2081.clarification
+++ b/changelogs/internal/newsfragments/2081.clarification
@ -0,0 +1 @@
+Adjust margins in rendered endpoints.
Author	SHA1	Message	Date
Kévin Commaille	f24ff877a1	Merge `e4fc47ece1` into `cb6d039c57`	2025-03-27 12:34:28 +00:00
Travis Ralston	cb6d039c57	Normalize changelog 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	2025-03-25 15:40:04 -06: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