Skip to content

Commit

Permalink
Remove boxes/added-in-paragraph shortcode
Browse files Browse the repository at this point in the history
It was added to work around a bug that made the `added-in` and `changed-in`
partials appear as separate blocks rather than inline.
This issue does not happen anymore.

Signed-off-by: Kévin Commaille <[email protected]>
  • Loading branch information
zecakeh committed Oct 13, 2024
1 parent ae3673d commit fc64323
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 53 deletions.
23 changes: 0 additions & 23 deletions assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -277,29 +277,6 @@ 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 */
Expand Down
6 changes: 0 additions & 6 deletions content/client-server-api/modules/content_repo.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,17 @@ 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 %}}

{{% boxes/added-in-paragraph %}}
{{< changed-in v="1.11" >}} The unauthenticated download endpoints have been
deprecated in favour of newer, authenticated, ones. This change includes updating
the paths of all media endpoints from `/_matrix/media/*` to `/_matrix/client/{version}/media/*`,
with the exception of the `/upload` and `/create` endpoints. The upload/create
endpoints are expected to undergo a similar transition in a later version of the
specification.
{{% /boxes/added-in-paragraph %}}

#### Matrix Content (`mxc://`) URIs

Expand All @@ -48,11 +44,9 @@ mxc://<server-name>/<media-id>

Clients can access the content repository using the following endpoints.

{{% boxes/added-in-paragraph %}}
{{< changed-in v="1.11" >}} A number of endpoints under the /_matrix/media hierarchy
have been deprecated and replaced with new endpoints which require authentication.
The deprecated endpoints are marked in the section below.
{{% /boxes/added-in-paragraph %}}

{{% boxes/warning %}}
By Matrix 1.12, servers SHOULD "freeze" the deprecated, unauthenticated, endpoints
Expand Down
2 changes: 0 additions & 2 deletions content/server-server-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,6 @@ Servers MUST use the server described in the [Matrix Content URI](/client-server
Formatted as `mxc://{ServerName}/{MediaID}`, servers MUST download the media from
`ServerName` using the below endpoints.

{{% boxes/added-in-paragraph %}}
{{< changed-in v="1.11" >}} Servers were previously advised to use the `/_matrix/media/*`
endpoints described by the [Content Repository module in the Client-Server API](/client-server-api/#content-repository),
however, those endpoints have been deprecated. New endpoints are introduced which
Expand All @@ -1213,7 +1212,6 @@ the required access token to those endpoints. Instead, servers MUST try the endp
described below before falling back to the deprecated `/_matrix/media/*` endpoints
when they receive a `404 M_UNRECOGNIZED` error. When falling back, servers MUST
be sure to set `allow_remote` to `false`.
{{% /boxes/added-in-paragraph %}}

{{% http-api spec="server-server" api="content_repository" %}}

Expand Down
22 changes: 0 additions & 22 deletions layouts/shortcodes/boxes/added-in-paragraph.html

This file was deleted.

0 comments on commit fc64323

Please sign in to comment.