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.

Sign up for GitHub

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

Jump to bottom

fix: errors when defining typography with css variables #16475

Merged
merged 1 commit into from Jul 19, 2019
Merged

fix: errors when defining typography with css variables #16475

merged 1 commit into from Jul 19, 2019

Conversation

bpetex
Copy link
Contributor

@bpetex bpetex commented Jul 8, 2019

  • Fixes invalid operation error for font-size calculation with css variables

@bpetex bpetex requested a review from crisbeto as a code owner July 8, 2019 16:56
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added the cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla label Jul 8, 2019
jelbourn
jelbourn reviewed Jul 18, 2019
View reviewed changes
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

Are you able to sign the CLA?

src/material/core/typography/_typography.scss
@@ -96,7 +96,7 @@
// and h6 at 0.67em.
.mat-h5, #{$selector} h5 {
@include mat-typography-font-shorthand(
mat-font-size($config, body-1) * 0.83,
calc(#{mat-font-size($config, body-1)} * 0.83),
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment that explains the use of calc here? I could see someone removing it without considering CSS variables.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure

@bpetex
Copy link
Contributor Author

bpetex commented Jul 18, 2019

I was confused about why there is a CLA agreement issue, but I realized it's probably because I made the commit with a different email address. I'll fix that

@bpetex
fix: errors when defining typography with css variables
cb1578a 
* Fixes invalid operation error for font-size calculation with css variables
@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes PR author has agreed to Google's Contributor License Agreement and removed cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla labels Jul 18, 2019
jelbourn
jelbourn approved these changes Jul 18, 2019
View reviewed changes
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks!

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Jul 18, 2019
@jelbourn jelbourn merged commit d9977bd into angular:master Jul 19, 2019
andrewseguin pushed a commit that referenced this pull request Jul 29, 2019
@bpetex @andrewseguin
fix(typography): use calc to allow css variables (#16475)
6013036
@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 Sep 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jelbourn jelbourn jelbourn approved these changes

@crisbeto crisbeto Awaiting requested review from crisbeto

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bpetex @googlebot @jelbourn