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

Merge styles of _EmailAddresses.pcss and _PhoneNumbers.pcss #10679

Merged
merged 16 commits into from
May 3, 2023
Merged

Merge styles of _EmailAddresses.pcss and _PhoneNumbers.pcss #10679

merged 16 commits into from
May 3, 2023

Conversation

luixxiul
Copy link
Contributor

@luixxiul luixxiul commented Apr 20, 2023

Closes element-hq/element-web#25167

This PR intends to merge styles shared by _EmailAddresses.pcss and _PhoneNumbers.pcss. Since some declarations for both files have already been managed on _GeneralUserSettingsTab.pcss, managing other declarations shared by both components as well should be fine.

1

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

type: task

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

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

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

`mx_EmailAddress--existing_*` and `mx_PhoneNumber--existing_*` adopt the same declarations, so maintaining them with common selectors should improve the maintainability.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com
…` to `mx_GeneralUserSettingsTab_discovery_existing_*`

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

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
The button with the class name 'mx_GeneralUserSettingsTab_discovery_existing_button' is used for various types of action, so 'confirm' seems to be a bit misleading.

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>
@github-actions github-actions bot added Z-Community-PR Issue is solved by a community member's PR T-Task Refactoring, enabling or disabling functionality, other engineering tasks labels Apr 20, 2023
Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
@luixxiul luixxiul marked this pull request as ready for review April 22, 2023 10:00
@luixxiul luixxiul requested a review from a team as a code owner April 22, 2023 10:00
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

otherwise lgtm!

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

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

Haven't done a full review, but the changes requested by @gsouquet have been made

@richvdh richvdh dismissed germain-gg’s stale review May 3, 2023 11:34

changes made

@richvdh richvdh added this pull request to the merge queue May 3, 2023
Merged via the queue into matrix-org:develop with commit 9b7e786 May 3, 2023
@luixxiul luixxiul deleted the css-EmailAddress-PhoneNumber branch May 3, 2023 13:49
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 Z-Community-PR Issue is solved by a community member's PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge styles of EmailAddresses.tsx and PhoneNumbers.tsx
3 participants