Skip to content

fix(material/core): default font family not applied to custom typography levels #26394

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 10, 2023

Conversation

crisbeto
Copy link
Member

Fixes the following regressions with the new typography config:

I've also set up tests for the config since changing the logic can be annoying to debug.

Fixes #26387.

…phy levels

Fixes the following regressions with the new typography config:
* After angular#25789, the top-level font family wasn't being applied to the individual levels anymore.
* Custom typography levels were defaulting to a `null` font family while the default ones were defaulting to `Roboto` which was inconsistent. Now they both default to `Roboto` like they did in the legacy config.

I've also set up tests for the config since changing the logic can be annoying to debug.

Fixes angular#26387.
@crisbeto crisbeto added P2 The issue is important to a large percentage of users, with a workaround target: patch This PR is targeted for the next patch release labels Jan 10, 2023
Copy link
Contributor

@mmalerba mmalerba left a comment

Choose a reason for hiding this comment

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

LGTM

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Jan 10, 2023
@crisbeto crisbeto merged commit 20841a8 into angular:main Jan 10, 2023
crisbeto added a commit that referenced this pull request Jan 10, 2023
…phy levels (#26394)

Fixes the following regressions with the new typography config:
* After #25789, the top-level font family wasn't being applied to the individual levels anymore.
* Custom typography levels were defaulting to a `null` font family while the default ones were defaulting to `Roboto` which was inconsistent. Now they both default to `Roboto` like they did in the legacy config.

I've also set up tests for the config since changing the logic can be annoying to debug.

Fixes #26387.

(cherry picked from commit 20841a8)
crisbeto added a commit that referenced this pull request Jan 10, 2023
…phy levels (#26394)

Fixes the following regressions with the new typography config:
* After #25789, the top-level font family wasn't being applied to the individual levels anymore.
* Custom typography levels were defaulting to a `null` font family while the default ones were defaulting to `Roboto` which was inconsistent. Now they both default to `Roboto` like they did in the legacy config.

I've also set up tests for the config since changing the logic can be annoying to debug.

Fixes #26387.

(cherry picked from commit 20841a8)
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Jan 13, 2023
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@angular/cdk](https://github.com/angular/components) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fcdk/15.0.4/15.1.0) |
| [@angular/material](https://github.com/angular/components) | dependencies | minor | [`15.0.4` -> `15.1.0`](https://renovatebot.com/diffs/npm/@angular%2fmaterial/15.0.4/15.1.0) |

---

### Release Notes

<details>
<summary>angular/components</summary>

### [`v15.1.0`](https://github.com/angular/components/blob/HEAD/CHANGELOG.md#&#8203;1510-silk-sandal-2023-01-11)

[Compare Source](angular/components@15.0.4...15.1.0)

##### cdk

| Commit | Type | Description |
| -- | -- | -- |
| [e0a74b9c2b](angular/components@e0a74b9) | feat | **menu:** Allow setting cdkMenuTriggerFor null ([#&#8203;25818](angular/components#25818)) |
| [b0f0b5b162](angular/components@b0f0b5b) | fix | **drag-drop:** receiving class not updated in OnPush component ([#&#8203;26386](angular/components#26386)) |
| [836b777526](angular/components@836b777) | fix | **menu:** don't prevent default selection key actions ([#&#8203;26296](angular/components#26296)) |

##### material

| Commit | Type | Description |
| -- | -- | -- |
| [8554e15383](angular/components@8554e15) | feat | **datepicker:** Support drag and drop to adjust date ranges ([#&#8203;25548](angular/components#25548)) |
| [c370e064d4](angular/components@c370e06) | feat | **tabs:** add a harness filter for tab selected state ([#&#8203;25806](angular/components#25806)) |
| [44657e2624](angular/components@44657e2) | fix | **autocomplete:** apply theme of parent form field to panel ([#&#8203;25983](angular/components#25983)) |
| [9b1f49f6f2](angular/components@9b1f49f) | fix | **chips:** add support for aria-description ([#&#8203;25935](angular/components#25935)) |
| [8b19fd9e29](angular/components@8b19fd9) | fix | **chips:** change div to span ([#&#8203;26343](angular/components#26343)) |
| [dcf2fac042](angular/components@dcf2fac) | fix | **chips:** implement ariaDescription with aria-describedby ([#&#8203;26105](angular/components#26105)) |
| [e536ce0736](angular/components@e536ce0) | fix | **core:** default font family not applied to custom typography levels ([#&#8203;26394](angular/components#26394)) |
| [d02cc6817c](angular/components@d02cc68) | fix | **datepicker:** fix date picker shortcuts ([#&#8203;25951](angular/components#25951)) |
| [4da9e1944a](angular/components@4da9e19) | fix | **datepicker:** Update strategy to handle dragging across month boundaries and/or DateAdapter implementations that do not return difference in days from compareDate ([#&#8203;26341](angular/components#26341)) |
| [25d9217fd1](angular/components@25d9217) | fix | **list:** add opt-out for radio indicators ([#&#8203;26283](angular/components#26283)) |
| [57676e467a](angular/components@57676e4) | fix | **list:** add radio toggles ([#&#8203;25933](angular/components#25933)) |
| [5b57863702](angular/components@5b57863) | fix | **list:** align color scheme between single and multi selection list ([#&#8203;26074](angular/components#26074)) |
| [1819d3027b](angular/components@1819d30) | fix | **tabs:** allow focus on disabled tabs ([#&#8203;26397](angular/components#26397)) |

#### Special Thanks

Amy Sorto, David Klingenberg, Joey Perrott, Karl Seamon, Kristiyan Kostadinov, Miles Malerba, Sasidharan SD, Wagner Maciel and Zach Arend

<!-- CHANGELOG SPLIT MARKER -->

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45Ny41IiwidXBkYXRlZEluVmVyIjoiMzQuMTAwLjEifQ==-->

Co-authored-by: cabr2-bot <[email protected]>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1723
Reviewed-by: Epsilon_02 <[email protected]>
Co-authored-by: Calciumdibromid Bot <[email protected]>
Co-committed-by: Calciumdibromid Bot <[email protected]>
@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 Feb 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 P2 The issue is important to a large percentage of users, with a workaround target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug(theming): Custom typography not applied to all typography levels
2 participants