Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-23 03:34:08 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prefer Arial Unicode MS over Arial

Browse source 
Fixes: #1125
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
This commit is contained in:
Johannes Marbach 2024-08-07 15:38:27 +02:00
parent 56914b72ef
commit 7ba05dbabf
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
assets/scss/_variables_project.scss
View file

@ -40,15 +40,18 @@ $table-bg: $secondary-lightest-background;
$td-enable-google-fonts: false;
/*
* Replace the default font with Inter.
* The $font-family-sans-serif definition here overrides the default value set by docsy
* (https://github.com/matrix-org/docsy/blob/66a4e61d2d34edc7196b9df83a7d09cd4af14b47/assets/scss/_variables.scss#L68)
* and:
*
* The $font-family-sans-serif definition here overrides the default value set by docsy:
* https://github.com/matrix-org/docsy/blob/66a4e61d2d34edc7196b9df83a7d09cd4af14b47/assets/scss/_variables.scss#L68
* and adds "Inter" to the front.
* - Adds "Inter" to the front (making it the default)
* - Inserts "Arial Unicode MS" before "Arial" (because the former contains more mathematical glyphs)
*
* The font itself is loaded via stylesheet link layouts/partials/hooks/head-end.html.
* The Inter font itself is loaded via stylesheet links layouts/partials/hooks/head-end.html.
*/
$font-family-sans-serif: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
$font-family-sans-serif: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
"Helvetica Neue", Arial Unicode MS, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol";
// Disable smooth scrolling as it makes TOC highlighting jump during the transition.
$enable-smooth-scroll: false;

2
content/rooms/fragments/v2-state-res.md
View file

@ -50,7 +50,7 @@ chain for each state *S*<sub>*i*</sub>, that is the union of the auth
chains for each event in *S*<sub>*i*</sub>, and then taking every event
that doesn't appear in every auth chain. If *C*<sub>*i*</sub> is the
full auth chain of *S*<sub>*i*</sub>, then the auth difference is
 ∪ *C*<sub>*i*</sub> −  ∩ *C*<sub>*i*</sub>.
∪ *C*<sub>*i*</sub> − ∩ *C*<sub>*i*</sub>.
**Full conflicted set.**
The *full conflicted set* is the union of the conflicted state set and