Skip to content

Move Navigation to VerticalNavigation #1476

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
Merged
merged 4 commits into from
Aug 3, 2018
Merged

Move Navigation to VerticalNavigation #1476

merged 4 commits into from
Aug 3, 2018

Conversation

interactivellama
Copy link
Contributor

@interactivellama interactivellama commented Jul 31, 2018 •
edited
Loading

Fixes #1240
Keeps alias with Navigation so non-breaking change.

Additional description

REVIEWER checklist (do not remove)

  • TravisCI tests pass. This includes linting, Mocha, Jest, Storyshots, and components/component-docs.json tests.
  • Tests have been added for new props to prevent regressions in the future. See readme.
  • Review the appropriate Storybook stories. Open http://localhost:9001/.
  • The Accessibility panel of each Storybook story has 0 violations (aXe). Open http://localhost:9001/.
  • Review tests are passing in the browser. Open http://localhost:8001/.
  • Review markup conforms to SLDS by looking at DOM snapshot strings.
  • Add year-first date and commit SHA to last-slds-markup-review in package.json and push.
  • Request a review of the deployed Heroku app by the Salesforce UX Accessibility Team.
  • Add year-first review date, and commit SHA, last-accessibility-review, to package.json and push.
  • While the contributor's branch is checked out, run npm run local-update within locally cloned site repo to confirm the site will function correctly at the next release.

futuremint
futuremint suggested changes Aug 3, 2018
View reviewed changes
Copy link
Contributor

@futuremint futuremint left a comment

Choose a reason for hiding this comment

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

Looks good, just has a conflict in package.json.

@interactivellama
Merge branch 'master' of github.com:salesforce/design-system-react in…
ff4ad84 
…to vertical-navigation

# Conflicts:
#	components/component-docs.json
#	package.json
@interactivellama
Merge branch 'vertical-navigation' of github.com:interactivellama/des…
64b8506 
…ign-system-react into vertical-navigation

# Conflicts:
#	package.json
@interactivellama
Copy link
Contributor Author

Updated with fixed package.json

@futuremint futuremint merged commit 41331ae into salesforce:master Aug 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@futuremint futuremint futuremint approved these changes

Assignees
No one assigned
Labels
vertical-navigation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@interactivellama @futuremint