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

Force style rules of buttons on MessageActionBar used with maskButton selector #8780

Merged
merged 8 commits into from
Jun 8, 2022
Merged

Force style rules of buttons on MessageActionBar used with maskButton selector #8780

merged 8 commits into from
Jun 8, 2022

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Jun 8, 2022

Before After
before after

This PR tries to ensure that the style rules of buttons on message action bar used with only with mx_MessageActionBar_maskButton selector and prevent the styles from being referred/stolen somewhere else.

The next task would be to include the rule block of mx_MessageActionBar_maskButton in mx_MessageActionBar, which requires analysis as those rules are referred from other files which are irrelevant to the message action bar.

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

type: task


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

@github-actions github-actions bot added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Jun 8, 2022
…maskButton

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

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

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

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul luixxiul marked this pull request as ready for review June 8, 2022 02:09
@luixxiul luixxiul requested a review from a team as a code owner June 8, 2022 02:09
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.

Hi @luixxiul thank you for your contribution.

Can you please check my comment? After resolving this re-request review. It will be much easier for me then.

res/css/views/messages/_MessageActionBar.scss Show resolved Hide resolved
@luixxiul luixxiul requested a review from weeman1337 June 8, 2022 08:25
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.

Tested, works. LGTM 👍

@luixxiul
Copy link
Contributor Author

luixxiul commented Jun 8, 2022

@weeman1337 thanks for reviewing!

@weeman1337 weeman1337 merged commit 66daaf0 into matrix-org:develop Jun 8, 2022
@luixxiul luixxiul deleted the MessageActionBar branch June 8, 2022 09:17
mask-size: 12px;
mask-image: url('$(res)/img/element-icons/expand-message.svg');
}
&.mx_MessageActionBar_downloadSpinnerButton::after {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed this nesting was wrong.

This means .mx_MessageActionBar_downloadButton::after.mx_MessageActionBar_downloadSpinnerButton::after, which in fact should be .mx_MessageActionBar_downloadButton.mx_MessageActionBar_downloadSpinnerButton::after.

https://github.com/matrix-org/matrix-react-sdk/pull/8780/files#diff-9e8827a9eadb4ec87e33b2387b4a9078ec3c38b91ec4696080d4ae6b6e9597e3L153

I'm pushing a fix as follow-up soon.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants