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

[Typography] Add custom variants support #22006

Merged
merged 18 commits into from
Aug 4, 2020
Merged

[Typography] Add custom variants support #22006

merged 18 commits into from
Aug 4, 2020

Commits on Jul 31, 2020

  1. added custom variants support to Typography

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    9769894 View commit details
    Browse the repository at this point in the history

  2. updated whitelistComponents list

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    75cd07b View commit details
    Browse the repository at this point in the history

  3. typings

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    ca559fc View commit details
    Browse the repository at this point in the history

  4. ts

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    0ecd5d6 View commit details
    Browse the repository at this point in the history

  5. inherit to p mapping

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    add9f3d View commit details
    Browse the repository at this point in the history

  6. removed tests

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    332330c View commit details
    Browse the repository at this point in the history

  7. added warnings test, removed unused imports

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    b34d233 View commit details
    Browse the repository at this point in the history

  8. prettier

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    16e61fe View commit details
    Browse the repository at this point in the history

  9. docs:api

    @mnajdova
    mnajdova committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    c201240 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2020

  1. variantsMapping propType

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    e1f156b View commit details
    Browse the repository at this point in the history

  2. reverted some changes

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    98c54da View commit details
    Browse the repository at this point in the history

  3. Update packages/material-ui-styles/src/makeStyles/makeStyles.js 

    Co-authored-by: Olivier Tassinari <[email protected]>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Aug 1, 2020
    Configuration menu
    Copy the full SHA
    a295bce View commit details
    Browse the repository at this point in the history

  4. framer fix

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    8f062ea View commit details
    Browse the repository at this point in the history

  5. typo

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    202b972 View commit details
    Browse the repository at this point in the history

  6. fixed prop rename

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    e05f141 View commit details
    Browse the repository at this point in the history

  7. Update framer/scripts/framerConfig.js 

    Co-authored-by: Olivier Tassinari <[email protected]>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Aug 1, 2020
    Configuration menu
    Copy the full SHA
    ffd21aa View commit details
    Browse the repository at this point in the history

  8. Merge branch 'next' into feat/typography-custom-variant

    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    8b6374c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feat/typography-custom-variant' of https://github.com/m… 

    …najdova/material-ui into feat/typography-custom-variant
    @mnajdova
    mnajdova committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    eb12d8f View commit details
    Browse the repository at this point in the history