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

Move style rules of MatrixChat_useCompactLayout from _GroupLayout.scss to _EventTile.scss and _RoomView.scss #8725

Merged
merged 10 commits into from
Jun 3, 2022
Merged

Move style rules of MatrixChat_useCompactLayout from _GroupLayout.scss to _EventTile.scss and _RoomView.scss #8725

merged 10 commits into from
Jun 3, 2022

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented May 31, 2022 •
edited by github-actions bot
Loading

This PR moves the style rules of MatrixChat_useCompactLayout from _GroupLayout.scss to _EventTile.scss and _RoomView.scss.

Since those declarations are not used to style elements of the group layout exclusively, they should be moved to corresponding SASS files. With #8711 _GroupLayout.scss is going to be removed.

type: task

Signed-off-by: Suguru Hirahara luixxiul@users.noreply.github.com

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

@luixxiul
Move mx_RoomView_MessageList h2 block from _GroupLayout.scss to _Room…
eace253 
…View.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
Move mx_MatrixChat_useCompactLayout block from _GroupLayout.scss to _…
1ced44e 
…EventTile.scss

This block is not related to the group layout.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
Include EventTile_continuation block in EventTile_emote
1b88151 
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
Use logical properties for the padding values
c2c0cbd 
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
Sort declarations for maintainability
e2bbb30 
- EventTile_avatar
- EventTile_line
- EventTile_reply

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
yarn run lint:style --fix
64b0c1d 
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul
Separate selectors of .markdown-body
2e02394 
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@github-actions github-actions bot added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label May 31, 2022
@luixxiul luixxiul marked this pull request as ready for review May 31, 2022 15:49
@luixxiul luixxiul requested a review from a team as a code owner May 31, 2022 15:49
@MadLittleMods MadLittleMods added the Z-Community-PR Issue is solved by a community member's PR label Jun 1, 2022
weeman1337
weeman1337 approved these changes Jun 3, 2022
View reviewed changes
Copy link
Contributor

@weeman1337 weeman1337 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thank you for your contribution 🙂

Tested on the Netlify deployment. The layout still looks good ✔️

@weeman1337 weeman1337 merged commit 228abb6 into matrix-org:develop Jun 3, 2022
@luixxiul luixxiul deleted the MatrixChat_useCompactLayout branch June 3, 2022 06:50
@luixxiul luixxiul mentioned this pull request Jun 3, 2022
Merged
@lieuwex
Copy link
Contributor

lieuwex commented Jun 3, 2022

Is it possible that this PR increased the padding and/or margins ever so slightly? I use develop.element.io and I feel like the messages are just a bit more separated.

@luixxiul
Copy link
Contributor Author

luixxiul commented Jun 3, 2022

I am not sure whether the change has been applied to develop.element.io, but it is possible to dig deeper if you could either provide a screenshot or point out which elements are affected.

Basically this PR fixed the issue that style blocks for EventTile have scattered over multiple files, and it might have changed how style rules are inherited. In this case the issue has been hidden unintentionally.

@weeman1337
Copy link
Contributor

weeman1337 commented Jun 3, 2022 •
edited
Loading

Is it possible that this PR increased the padding and/or margins ever so slightly? I use develop.element.io and I feel like the messages are just a bit more separated.

Thanks for the pointer. Going to check that…

@weeman1337
Copy link
Contributor

weeman1337 commented Jun 3, 2022 •
edited
Loading

Good spot @lieuwex . Looks like the PR broke the compact layout:

image

@luixxiul for now I would suggest to open a reverting PR, ok?

@luixxiul
Copy link
Contributor Author

luixxiul commented Jun 3, 2022

ach it is annoying to see this kind of regression happens only by moving style rules to the file which they should belong...

@luixxiul luixxiul mentioned this pull request Jun 3, 2022
Merged
weeman1337 pushed a commit that referenced this pull request Jun 3, 2022
@luixxiul
Revert "Move style rules of MatrixChat_useCompactLayout from _GroupLa…
ef6bd35 
…yout.scss to _EventTile.scss and _RoomView.scss (#8725)" (#8751)

This reverts commit 228abb6.
This was referenced Jun 3, 2022
Closed
Merged
JanBurp pushed a commit to JanBurp/matrix-react-sdk that referenced this pull request Jun 14, 2022
@luixxiul @JanBurp
Move style rules of MatrixChat_useCompactLayout from _GroupLayout.scs…
a45f754 
…s to _EventTile.scss and _RoomView.scss (matrix-org#8725)

* Move mx_RoomView_MessageList h2 block from _GroupLayout.scss to _RoomView.scss

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Move mx_MatrixChat_useCompactLayout block from _GroupLayout.scss to _EventTile.scss

This block is not related to the group layout.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Include EventTile_continuation block in EventTile_emote

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Use logical properties for the padding values

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Sort declarations for maintainability

- EventTile_avatar
- EventTile_line
- EventTile_reply

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Separate selectors of .markdown-body

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
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.
@luixxiul luixxiul mentioned this pull request Feb 27, 2023
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@weeman1337 weeman1337 weeman1337 approved these changes

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.
4 participants
@luixxiul @lieuwex @weeman1337 @MadLittleMods