enabled smooth scrolling. #2
Merged
Conversation
This file contains hidden or 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
Owner
|
hey @kisonay sorry it took me a while to take a look at this.. could you pls resubmit without re-indenting the file? the way you did it the whole file is conflicted and I cant easily distinguish between what is conflicting because of your code from what is merely indentation.. |
Author
|
I don't remember what changes I made and haven't had the time to go through it all and re-apply them to a clean copy of the file which I didn't mess with the indentation. I will try to get to it this week. |
Owner
|
ok. tks |
Author
|
Think I fixed everything, let me know if you still have issues. I didn't commit any updates to the dist folder but can do that if you would like. |
added 2 commits
September 16, 2015 15:02
… smooth-scroll-without-jquery Conflicts: bower.json demo/index.html src/tour/tour.js
Author
|
went ahead and resolved conflicts. |
Owner
|
thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Got both horizontal and vertical scrolling working.