Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Revert "Move style rules of MatrixChat_useCompactLayout from _GroupLayout.scss to _EventTile.scss and _RoomView.scss" #8751

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Revert "Move style rules of MatrixChat_useCompactLayout from _GroupLayout.scss to _EventTile.scss and _RoomView.scss" #8751

merged 1 commit into from
Jun 3, 2022

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Jun 3, 2022 •
edited by github-actions bot
Loading

Reverts #8725

The structure of style inheritance needs to be studied.

This change is marked as an internal change (Task), so will not be included in the changelog.

@luixxiul
Revert "Move style rules of MatrixChat_useCompactLayout from _GroupLa…
8b9e8bd 
…yout.scss to _EventTile.scss and _RoomView.scss (#8725)"

This reverts commit 228abb6.
@weeman1337 weeman1337 added Z-Community-PR Issue is solved by a community member's PR T-Task Refactoring, enabling or disabling functionality, other engineering tasks labels Jun 3, 2022
@luixxiul luixxiul marked this pull request as ready for review June 3, 2022 10:09
@luixxiul luixxiul requested a review from a team as a code owner June 3, 2022 10:09
@weeman1337 weeman1337 self-requested a review June 3, 2022 10:10
weeman1337
weeman1337 approved these changes Jun 3, 2022
View reviewed changes
Copy link
Contributor

@weeman1337 weeman1337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The compact layout seems to be good again.

@weeman1337 weeman1337 merged commit ef6bd35 into matrix-org:develop Jun 3, 2022
@luixxiul luixxiul deleted the revert-8725-MatrixChat_useCompactLayout branch June 3, 2022 10:24
@luixxiul
Copy link
Contributor Author

luixxiul commented Jun 3, 2022

@weeman1337 the style inheritance was studied, and I found out the root cause and the way to fix it. Please have a look at element-hq/element-web#22434 (comment) when you have some time.

The root cause was mixing different levels of style blocks on _GroupLayout.scss and cascading order defined alphabetically on _components.scss.

Confirmed manually that moving the block to _EventTile.scss, considering the cascading order on that file, worked as expected. Going to create another PR to move the block correctly, without breaking something.

JanBurp pushed a commit to JanBurp/matrix-react-sdk that referenced this pull request Jun 14, 2022
@luixxiul @JanBurp
Revert "Move style rules of MatrixChat_useCompactLayout from _GroupLa…
016daab 
…yout.scss to _EventTile.scss and _RoomView.scss (matrix-org#8725)" (matrix-org#8751)

This reverts commit 228abb6.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
1 more reviewer

@weeman1337 weeman1337 weeman1337 approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks Z-Community-PR Issue is solved by a community member's PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@luixxiul @weeman1337