Skip to content

Commit

Permalink
Update mixin name
Browse files Browse the repository at this point in the history
Signed-off-by: Suguru Hirahara <[email protected]>
  • Loading branch information
luixxiul committed Mar 4, 2024
1 parent 42e5891 commit bb33334
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

/* Fix upstream's style inconsistencies among mx_TextualEvent, mx_RedactedBody, and mx_DecryptionFailureBody */
/* Fix upstream's style inconsistencies among text events and mx_DecryptionFailureBody */
/* See https://github.com/SchildiChat/schildichat-desktop/issues/240 */

@import "./views/rooms/_EventTile.pcss";
@import "./views/messages/_DecryptionFailureBody.pcss";

@define-mixin consistency__TextEvent {
@mixin EventTile_color;
@mixin EventTile_font;
@mixin EventTile_line_color;
@mixin EventTile_line_font;
@mixin DecryptionFailureBody;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2019 The Matrix.org Foundation C.I.C.
Copyright 2024 Suguru Hirahara
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,7 @@ limitations under the License.

/* Specify text color with color property instead of opacity.
Note this mixin is applied to GELS as well. */
@define-mixin EventTile_color {
@define-mixin EventTile_line_color {
:where(.mx_EventTile_info, .mx_GenericEventListSummary) {
/* Get rid of opacity values for coloring from CSS files as it is very
confusing and makes it difficult to maintain consistency.
Expand All @@ -43,7 +43,7 @@ limitations under the License.
}

/* Specify font for consistency */
@define-mixin EventTile_font {
@define-mixin EventTile_line_font {
:where(.mx_EventTile_info, .mx_GenericEventListSummary) {
--font: var(--cpd-font-body-sm-regular); /* Replace with js when needed */

Expand Down

0 comments on commit bb33334

Please sign in to comment.