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

[Button] Custom variant #21648

Merged
merged 86 commits into from
Jul 27, 2020
Merged

[Button] Custom variant #21648

merged 86 commits into from
Jul 27, 2020

Commits on Jun 29, 2020

  1. wip

    @mnajdova
    mnajdova committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    97aac4e View commit details
    Browse the repository at this point in the history

  2. wip

    @mnajdova
    mnajdova committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    dd57f8e View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. wip

    @mnajdova
    mnajdova committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    5c3d592 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. relaxed overrides

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

Commits on Jul 2, 2020

  1. added additions

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

  2. cleanup

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

  3. cleanup

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

  4. prettier

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

Commits on Jul 4, 2020

  1. wip

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

Commits on Jul 5, 2020

  1. another alternative

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

  2. Update packages/material-ui-styles/src/getStylesCreator/getStylesCrea… 

    …tor.js
    @mnajdova
    mnajdova authored Jul 5, 2020
    Configuration menu
    Copy the full SHA
    1b94f50 View commit details
    Browse the repository at this point in the history

  3. comb of props

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

  4. Update packages/material-ui-styles/src/getStylesCreator/getStylesCrea… 

    …tor.js
    @mnajdova
    mnajdova authored Jul 5, 2020
    Configuration menu
    Copy the full SHA
    df60098 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. cleanup

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

  2. ts example updated

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

  3. Merge branch 'next' into feat/custom-variants

    @mnajdova
    mnajdova authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    7db6a98 View commit details
    Browse the repository at this point in the history

  4. Update packages/material-ui-styles/src/withStyles/withStyles.js

    @mnajdova
    mnajdova authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    c032672 View commit details
    Browse the repository at this point in the history

  5. Update packages/material-ui-styles/src/withStyles/withStyles.js

    @mnajdova
    mnajdova authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    22d5f4a View commit details
    Browse the repository at this point in the history

  6. reverted changes

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

  7. Update packages/material-ui/src/styles/createMuiTheme.js

    @mnajdova
    mnajdova authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    212db32 View commit details
    Browse the repository at this point in the history

  8. tests fixes

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

  9. prettier

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

Commits on Jul 7, 2020

  1. addressing comments

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

  2. prettier

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

  3. replace relaxed typings with ts declare module

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

  4. improved description

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

Commits on Jul 8, 2020

  1. themeMerge

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

  2. prettier

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

Commits on Jul 10, 2020

  1. extract capitalize in utils

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

  2. removed mergeThemes

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

  3. fix

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

  4. fixes

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

  5. break circular dependency

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

  6. restricted to variables

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

  7. reverted some changes

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

  8. docs:api

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

  9. removed new capitalize method

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

Commits on Jul 11, 2020

  1. removed default exprot

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

  2. revert some changes, improved example

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

  3. prettier

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

Commits on Jul 12, 2020

  1. example updated

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

Commits on Jul 18, 2020

  1. Update packages/material-ui-styles/src/getStylesCreator/getStylesCrea… 

    …tor.js

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

  2. updated demo

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

  3. Merge branch 'feat/custom-variants' of https://github.com/mnajdova/ma… 

    …terial-ui into feat/custom-variants
    @mnajdova
    mnajdova committed Jul 18, 2020
    Configuration menu
    Copy the full SHA
    0c00ea9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'next' into feat/custom-variants

    @mnajdova
    mnajdova authored Jul 18, 2020
    Configuration menu
    Copy the full SHA
    70b713d View commit details
    Browse the repository at this point in the history

  5. prettier

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

  6. lint

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

Commits on Jul 19, 2020

  1. Update packages/material-ui-styles/src/getStylesCreator/getStylesCrea… 

    …tor.js

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

  2. Update packages/material-ui-styles/src/getStylesCreator/getStylesCrea… 

    …tor.js

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

  3. Update docs/src/pages/customization/components/components.md 

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

  4. added test

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

  5. prettier

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

  6. Update docs/src/pages/customization/components/components.md 

    Co-authored-by: Matt <[email protected]>
    @mnajdova @mbrookes
    mnajdova and mbrookes authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    3e1ea72 View commit details
    Browse the repository at this point in the history

  7. Update docs/src/pages/customization/components/components.md 

    Co-authored-by: Matt <[email protected]>
    @mnajdova @mbrookes
    mnajdova and mbrookes authored Jul 19, 2020
    Configuration menu
    Copy the full SHA
    90609ff View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. added warning, renamed matcher to props

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

Commits on Jul 21, 2020

  1. tests

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

  2. tests fixes

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

  3. prettier

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

  4. prettier

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

Commits on Jul 23, 2020

  1. added logic for dynamic classkeys generation

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

  2. Merge branch 'next' into feat/custom-variants

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

  3. merge conflicts

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

  4. added tests for warnings, refactored tests

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

  5. prettier

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

  6. improved test

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

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

    Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 23, 2020
    Configuration menu
    Copy the full SHA
    efe2e7d View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 23, 2020
    Configuration menu
    Copy the full SHA
    4ce2381 View commit details
    Browse the repository at this point in the history

  9. Update packages/material-ui/src/Button/Button.test.js 

    Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 23, 2020
    Configuration menu
    Copy the full SHA
    048cd39 View commit details
    Browse the repository at this point in the history

  10. addressing comments

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

  11. added more description to the docs section

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

  12. prettier

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

  13. added test

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

  14. fixed name

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

  15. polish

    @oliviertassinari
    oliviertassinari committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    af088c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. added hook for variants

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

  2. prettier

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

  3. added test

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

  4. prettier

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

Commits on Jul 27, 2020

  1. Update packages/material-ui-styles/src/useThemeVariants/useThemeVaria… 

    …nts.test.js

Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    2bb3a29 View commit details
    Browse the repository at this point in the history

  2. Update packages/material-ui/src/Button/Button.js 

    Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    52d11c8 View commit details
    Browse the repository at this point in the history

  3. Update packages/material-ui-styles/src/useThemeVariants/useThemeVaria… 

    …nts.test.js

Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    55f0507 View commit details
    Browse the repository at this point in the history

  4. Update packages/material-ui/src/styles/createMuiTheme.js 

    Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    44e2f1d View commit details
    Browse the repository at this point in the history

  5. Update packages/material-ui-styles/src/useThemeVariants/useThemeVaria… 

    …nts.test.js

Co-authored-by: Sebastian Silbermann <[email protected]>
    @mnajdova @eps1lon
    mnajdova and eps1lon authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    a55dfe4 View commit details
    Browse the repository at this point in the history

  6. Update packages/material-ui/src/styles/createMuiTheme.js

    @mnajdova
    mnajdova authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    6b1742a View commit details
    Browse the repository at this point in the history

  7. fixed props destructuring order

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

  8. Merge branch 'next' into feat/custom-variants

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