Skip to content

refactor(typography): add mixin for shorthand declaration and use shorthand for h5 and h6 #9346

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

Merged
merged 1 commit into from
Jan 23, 2018

Conversation

crisbeto
Copy link
Member

  • Moves our font declaration shorthand logic into the mat-typography-font-shorthand mixin to make it easier to use without passing in a typography config.
  • Switches the h5 and h6 to use the shorthands.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jan 11, 2018
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

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Jan 11, 2018
@crisbeto crisbeto added the target: patch This PR is targeted for the next patch release label Jan 11, 2018
// in order to prevent SASS from dividing the two values.
// Otherwise use the shorthand `font`, because it's the least amount of bytes. Note
// that we need to use interpolation for `font-size/line-height` in order to prevent
// SASS from dividing the two values.
Copy link
Contributor

Choose a reason for hiding this comment

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

*SASS » Sass

@crisbeto crisbeto force-pushed the typography-shorthands-mixin branch from 30595c3 to 811bae2 Compare January 13, 2018 12:56
@josephperrott
Copy link
Member

needs rebase

@josephperrott josephperrott added pr: needs rebase and removed action: merge The PR is ready for merge by the caretaker labels Jan 19, 2018
…rthand for h5 and h6

* Moves our `font` declaration shorthand logic into the `mat-typography-font-shorthand` mixin to make it easier to use without passing in a typography config.
* Switches the `h5` and `h6` to use the shorthands.
@crisbeto crisbeto force-pushed the typography-shorthands-mixin branch from 811bae2 to de81726 Compare January 19, 2018 20:12
@crisbeto crisbeto added action: merge The PR is ready for merge by the caretaker and removed pr: needs rebase labels Jan 19, 2018
@crisbeto
Copy link
Member Author

Rebased.

@jelbourn jelbourn merged commit 4e8aa52 into angular:master Jan 23, 2018
@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 8, 2019
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 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
Development

Successfully merging this pull request may close these issues.

5 participants