wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add CORP headers to media repo (#1197)

Browse source 
* Add CORP headers to media repo

MSC: https://github.com/matrix-org/matrix-spec-proposals/pull/3828

* Write weird CSS rules to make added-in work inline in the CS spec

Even though our content doesn't need 2 paragraphs, it's good to have the capability to render it in the future.

* Remove test paragraph

* Refine prose

* spelling is key
This commit is contained in:
Travis Ralston 2022-08-09 12:44:51 -04:00 • committed by GitHub
parent b14759a27b
commit afc0e6a026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
assets/scss/custom.scss
View file

@ -260,6 +260,29 @@ footer {
border-left-width: 5px;
background: $warning-background;
}
// XXX: See the added-in-paragraph.html shortcode for more information on these styles.
&.added-in-paragraph {
// Remove the padding and margin to remove the box look
margin: 0 !important; // !important on both to override table-related rules
padding: 0 !important;
// Make pairs of "added-in" and content inline to each other. We do pairs so authors can
// describe two paragraphs with added-in prefixes within a single box, reducing DOM
// complexity. Each paragraph is expected to be prefixed with an added-in, however.
//
// XXX: We assume the added-in and text will be rendered as paragraph elements.
> p {
display: inline;
}
> p:nth-child(2n) { // "even" rule to target just the content paragraphs
// Force a paragraph break after the content (insert a couple <br /> tags)
&::after {
content: '\A\A';
white-space: pre;
}
}
}
}
/* Styles for sections that are rendered from data, such as HTTP APIs and event schemas */

1
changelogs/client_server/newsfragments/1197.feature Normal file
View file

@ -0,0 +1 @@
Add `Cross-Origin-Resource-Policy` (CORP) headers to media repository, as per [MSC3828](https://github.com/matrix-org/matrix-spec-proposals/pull/3828).

7
content/client-server-api/modules/content_repo.md
View file

@ -19,6 +19,13 @@ When serving content, the server SHOULD provide a
`Content-Security-Policy` header. The recommended policy is
`sandbox; default-src 'none'; script-src 'none'; plugin-types application/pdf; style-src 'unsafe-inline'; object-src 'self';`.
{{% boxes/added-in-paragraph %}}
{{< added-in v="1.4" >}} The server SHOULD additionally provide
`Cross-Origin-Resource-Policy: cross-origin` when serving content to allow
(web) clients to access restricted APIs such as `SharedArrayBuffer` when
interacting with the media repository.
{{% /boxes/added-in-paragraph %}}
#### Matrix Content (MXC) URIs
Content locations are represented as Matrix Content (MXC) URIs. They

22
layouts/shortcodes/boxes/added-in-paragraph.html Normal file
View file

@ -0,0 +1,22 @@
{{/*
"Temporary" shortcode for rendering paragraphs which want/need inline added-in tags. It is
assumed that your content is described as follows:
{{% boxes/added-in-paragraph %}}
{{< added-in v="1.4" >}} Your text here
{{< added-in v="1.4" >}} Your other text here
{{% /boxes/added-in-paragraph %}}
The assumption is that at a later date this added-in-paragraph shortcode can be removed, making
the angle bracket-defined added-in shortcodes *just work*.
It is important that each new "content" paragraph (the bit after added-in) is preceded with
and added-in, otherwise you might find your text being weirdly merged.
This exists while the added-in shortcode cannot be inline in the client-server spec.
See https://github.com/matrix-org/matrix-spec/issues/1204
*/}}
{{ partial "alert" (dict "type" "added-in-paragraph" "content" .Inner) }}