Sidebar multi expand options [menu-expand] #82
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # dist/css/json.css # dist/css/main.css # dist/css/theme.css # scss/config/_scale.scss
… into menu-expand
* master: Address review comments. update changelog hotfix: do not link to hidden internal private items Use .sassdocrc for subproject config. Pull CHANGELOG out of README. Nest sass opts under `herman.sass` object. fix merge Add changelog entry. Abstract shared JS. Fix merge error Branch review cleanup changelog render nav for subprojects render subproject pages Parse subprojects Conflicts: CHANGELOG.md dist/css/json.css dist/css/main.css dist/css/theme.css gulpfile.js index.js package.json scss/config/_scale.scss templates/base.j2
… into menu-expand # Conflicts: # dist/css/theme.css
|
@stacyk @mirisuzanne Is this ready for review/merge? |
… into menu-expand # Conflicts: # templates/item/macros.j2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#58
#87