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.

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

Resync with hakimel master #8

Merged
merged 121 commits into from
May 1, 2017
Merged

Resync with hakimel master #8

merged 121 commits into from
May 1, 2017

Conversation

chriwu
Copy link
Owner

@chriwu chriwu commented Apr 30, 2017

Pulled in latest changes from the original project.

Attention: this branch was fetched of of chris-detailed-notes. PR #7 has to go first.

Changes:

  • data-timing attributes per slide
  • polished slides (tldr, aspects etc.)
  • added new bngd images on collaboration slides
  • all other changes from Chris detailed notes #7

mojavelinux and others added 30 commits August 7, 2015 23:04
- allow display property apply to current slide to be configured
Syncing to current version
The data-preview-link=false tag can be used to switch off preview links
The `reveal.js` npm module is typically installed to access the CSS/JS
assets for Reveal.js. For those that want to run the plugins, they would
clone the whole repository. Hence, it doesn’t make sense to include
those as `dependencies`, which will increase download times.

Closes hakimel#1734.
…a elements, which are not already in paused state.
support <textarea data-template> `some code` </textarea>
Readme says the default is 'history: false', so it may be surprising
for users - it's easy to miss the contradicting setting in index.html
Allow background images without protocols to have query hashes/parameters.
Remove 'history: true' from index.html
@chriwu chriwu added the WIP label Apr 30, 2017
@chriwu chriwu self-assigned this Apr 30, 2017
@chriwu
Copy link
Owner Author

chriwu commented May 1, 2017

Rebased, conflicts resolved. @pm-nsimic please review.

@chriwu chriwu requested a review from pm-nsimic May 1, 2017 22:01
@chriwu chriwu added code complete and removed WIP labels May 1, 2017
Copy link
Collaborator

@pm-nsimic pm-nsimic left a comment

Choose a reason for hiding this comment

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

LGTM

@pm-nsimic pm-nsimic merged commit 2106142 into master May 1, 2017
@pm-nsimic pm-nsimic deleted the chris-pull-hakimel branch May 1, 2017 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.