diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2018-10-04 12:32:28 +0200 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2018-10-04 12:32:37 +0200 |
| commit | 8582c9aac8888bc71d2658377778279a5d5f0c34 (patch) | |
| tree | 4c38d89653af23ec9f4126b4fc1fd915b2eabbad /index.html | |
| parent | 90fc0bc466c505b5e3b6ce68532565f3dd0745ae (diff) | |
| parent | 250580fc4c97f83185e46f9d0e22286d0a01d3af (diff) | |
| download | perl-software-in-gnu-guix-8582c9aac8888bc71d2658377778279a5d5f0c34.tar perl-software-in-gnu-guix-8582c9aac8888bc71d2658377778279a5d5f0c34.tar.gz | |
resolve notes merge conflict
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -24,8 +24,23 @@ <body> <div class="reveal"> <div class="slides"> - <section>Slide 1</section> - <section>Slide 2</section> + <section data-timing="6"> + Slide 1 + + <aside> + these are not notes + </aside> + <aside class="notes"> + these are notes for the first slide + </aside> + </section> + <section> + Slide 2 + + <aside class="notes"> + these are the nodes for the second slide + </aside> + </section> </div> </div> @@ -42,7 +57,9 @@ { src: 'plugin/markdown/markdown.js' }, { src: 'plugin/notes/notes.js', async: true }, { src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } } - ] + ], + controlsTutorial: false, + defaultTiming: 3 }); </script> </body> |