From 7f32c7c7ef94e5eced26dc4c67ed78e13344b52a Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 3 Mar 2024 23:44:01 -0500 Subject: [PATCH] Update mixin name Signed-off-by: Suguru Hirahara --- .../feature-improvement/consistency__TextEvent/index.pcss | 6 +++--- .../consistency__TextEvent/views/rooms/_EventTile.pcss | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/css/_sc/feature-improvement/consistency__TextEvent/index.pcss b/res/css/_sc/feature-improvement/consistency__TextEvent/index.pcss index 575c86a872d..14db2c9a9a7 100644 --- a/res/css/_sc/feature-improvement/consistency__TextEvent/index.pcss +++ b/res/css/_sc/feature-improvement/consistency__TextEvent/index.pcss @@ -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; } diff --git a/res/css/_sc/feature-improvement/consistency__TextEvent/views/rooms/_EventTile.pcss b/res/css/_sc/feature-improvement/consistency__TextEvent/views/rooms/_EventTile.pcss index 61aee273308..60aa747cf4f 100644 --- a/res/css/_sc/feature-improvement/consistency__TextEvent/views/rooms/_EventTile.pcss +++ b/res/css/_sc/feature-improvement/consistency__TextEvent/views/rooms/_EventTile.pcss @@ -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. @@ -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 */