Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

feat(Menu): added shape prop and changed the meaning of the type prop #68

Merged
merged 10 commits into from
Jul 17, 2018
Merged

feat(Menu): added shape prop and changed the meaning of the type prop #68

merged 10 commits into from
Jul 17, 2018

Commits on Jul 10, 2018

  1. -initial implementation of the Menu shape and type props

    manajdov committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    dee7c60 View commit details
    Browse the repository at this point in the history

  2. -renamed unbordered Menu's shape to pills 

    -added examples of each shape with default and primary type
    manajdov committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    364eca9 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Merge branch 'master' into feat/menu-type-prop-refactoring 

    # Conflicts:
#	src/components/Menu/Menu.tsx
#	src/components/Menu/MenuItem.tsx
#	src/components/Menu/menuItemRules.ts
#	src/components/Menu/menuRules.ts
    manajdov committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    f7c10c7 View commit details
    Browse the repository at this point in the history

  2. -merge conflicts

    manajdov committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    8f33524 View commit details
    Browse the repository at this point in the history

  3. -fixes

    manajdov committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    0d43bef View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Merge branch 'master' into feat/menu-type-prop-refactoring

    manajdov committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    f3e4298 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Merge branch 'master' into feat/menu-type-prop-refactoring 

    # Conflicts:
#	docs/src/examples/components/Menu/Types/index.tsx
    manajdov committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    e93a1f6 View commit details
    Browse the repository at this point in the history

  2. -merged master 

    -added shorthand examples
    manajdov committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    299b26e View commit details
    Browse the repository at this point in the history

  3. -changed CHANGELOG.md

    manajdov committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    9b6c27f View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge branch 'master' into feat/menu-type-prop-refactoring

    manajdov committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    588aee4 View commit details
    Browse the repository at this point in the history