Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(material/button): fix raised button line-height #28073

Merged
merged 1 commit into from
Nov 9, 2023

Conversation

wagnermaciel
Copy link
Contributor

No description provided.

@wagnermaciel wagnermaciel marked this pull request as ready for review November 8, 2023 19:14
@wagnermaciel wagnermaciel added the target: rc This PR is targeted for the next release-candidate label Nov 8, 2023
@@ -168,6 +168,10 @@
@include mdc-helpers.using-mdc-typography($theme) {
@include mdc-button.without-ripple($query: mdc-helpers.$mdc-typography-styles-query);
}

.mat-mdc-raised-button {
line-height: inherit;
Copy link
Member

Choose a reason for hiding this comment

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

Have we tried putting this in the component base styles? I'm fine with having it here if it helps us land the changes, but it technically should be in the base.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I tried putting these in the components base styles, I also ran into an issue where some teams just aren't pulling in theme styles. As you can imagine, setting the line-height: inherit at a slightly higher specificity there resulted in a bunch of failures, so I moved the override over to the theme styles. This way, the override is right after the line-height: 36px coming from the without-ripple mixin on line 169, and it doesn't get pulled in for teams that aren't pulling in theme styles

Also, this will only be here temporarily. I need to land this change for each of the variants so that ripping out the without-ripple is feasible. Once these have landed, I'll then swap the without-ripple for our tokens and then I can remove these styles altogether

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense. It's not a blocker.

@wagnermaciel wagnermaciel added action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release and removed target: rc This PR is targeted for the next release-candidate labels Nov 9, 2023
@wagnermaciel wagnermaciel removed the request for review from andrewseguin November 9, 2023 16:28
@wagnermaciel wagnermaciel merged commit 59c8bb9 into angular:main Nov 9, 2023
25 of 28 checks passed
wagnermaciel added a commit that referenced this pull request Nov 9, 2023
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Dec 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants