Merge hell demo master #14
Open
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
- 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
…play logic for slide backgrounds
Allow background images without protocols to have query hashes/parameters.
Remove 'history: true' from index.html
cdn.mathjax.org is shutting down: https://www.mathjax.org/cdn-shutting-down/ This changes the default MathJax URL in the math plugin, as well as references in README.md and test/examples/math.html
replace cdn.mathjax.org with cdnjs
print-pdf using callback iso timer
print-pdf layout slide contents to fit stretch elements
Fix data-background-video autoplay on iOS Safari
This can be used by plugins which are concerned with helping the presenter with their pace.
This can be used by plugins which are concerned with helping the presenter with their pace.
This will allow us to reuse the display code for displaying an additional pacing timer.
This allows us to use different colours for different timers, which will be useful when we add a pacing timer.
and make muting work for negative values
Add an option to display advice on whether the current pace of the presentation is on track for the right timing (shown as green), and if not, whether the presenter should speed up (shown as red) or has the luxury of slowing down (blue). The pacing timer can be enabled by configuring by the `defaultTiming` parameter in the `Reveal` configuration block, which specifies the number of seconds per slide. 120 can be a reasonable rule of thumb. Timings can also be given per slide `<section>` by setting the `data-timing` attribute. Both values are in numbers of seconds. When the option is enabled, clicking on the timers will reset the timer to the beginning of the current slide, i.e. as if pacing was perfectly on track, not to zero as if the presentation had just begun.
pm-nsimic
requested changes
Jun 6, 2017
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.
This is our demo PR: demonstrate merge conflicts when trying to merge long-running branches.