diff options
author | Chris Lawrence | 2015-10-02 20:47:19 -0400 |
---|---|---|
committer | Chris Lawrence | 2015-10-02 20:47:19 -0400 |
commit | 69104e8e04c14ac91d396a41e0c05351ec2a96bf (patch) | |
tree | b95b95b20746a2a4d93fec64c4c4b10e6be85123 /test/examples | |
parent | 54082a8d76e8c12bb5b424f7ff21644632f054aa (diff) | |
parent | 01c55d4cf6ff60772be8a86320c4a5bcd7719a05 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/examples')
-rw-r--r-- | test/examples/barebones.html | 4 | ||||
-rw-r--r-- | test/examples/embedded-media.html | 4 | ||||
-rw-r--r-- | test/examples/math.html | 4 | ||||
-rw-r--r-- | test/examples/slide-backgrounds.html | 36 | ||||
-rw-r--r-- | test/examples/slide-transitions.html | 101 |
5 files changed, 136 insertions, 13 deletions
diff --git a/test/examples/barebones.html b/test/examples/barebones.html index c948d00..2bee3cb 100644 --- a/test/examples/barebones.html +++ b/test/examples/barebones.html @@ -6,7 +6,7 @@ <title>reveal.js - Barebones</title> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> </head> <body> @@ -29,7 +29,7 @@ </div> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/embedded-media.html b/test/examples/embedded-media.html index c654278..bbad4be 100644 --- a/test/examples/embedded-media.html +++ b/test/examples/embedded-media.html @@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/default.css" id="theme"> </head> @@ -35,7 +35,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/math.html b/test/examples/math.html index 93eff22..1b80e03 100644 --- a/test/examples/math.html +++ b/test/examples/math.html @@ -8,7 +8,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/night.css" id="theme"> </head> @@ -160,7 +160,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/slide-backgrounds.html b/test/examples/slide-backgrounds.html index 4f0fe62..4e5e406 100644 --- a/test/examples/slide-backgrounds.html +++ b/test/examples/slide-backgrounds.html @@ -8,8 +8,18 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> - <link rel="stylesheet" href="../../css/reveal.min.css"> + <link rel="stylesheet" href="../../css/reveal.css"> <link rel="stylesheet" href="../../css/theme/serif.css" id="theme"> + <style type="text/css" media="screen"> + .slides section.has-dark-background, + .slides section.has-dark-background h2 { + color: #fff; + } + .slides section.has-light-background, + .slides section.has-light-background h2 { + color: #222; + } + </style> </head> <body> @@ -26,6 +36,10 @@ <h2>data-background: #bb00bb</h2> </section> + <section data-background-color="lightblue"> + <h2>data-background: lightblue</h2> + </section> + <section> <section data-background="#ff0000"> <h2>data-background: #ff0000</h2> @@ -45,25 +59,25 @@ <section> <h2>Background applied to stack</h2> </section> - <section data-background="rgba(100, 0, 0, 0.2)"> + <section data-background="rgb(66, 66, 66)"> <h2>Background applied to slide inside of stack</h2> </section> </section> - <section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)"> + <section data-background-transition="slide" data-background="assets/image1.png"> <h2>Background image</h2> </section> <section> - <section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)"> + <section data-background-transition="slide" data-background="assets/image1.png"> <h2>Background image</h2> </section> - <section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)"> + <section data-background-transition="slide" data-background="assets/image1.png"> <h2>Background image</h2> </section> </section> - <section data-background="assets/image2.png" data-background-size="100px" data-background-repeat="repeat" data-background-color="#111" style="background: rgba(255,255,255,0.9)"> + <section data-background="assets/image2.png" data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"> <h2>Background image</h2> <pre>data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"</pre> </section> @@ -75,6 +89,14 @@ <h2>Same background twice (2/2)</h2> </section> + <section data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm"> + <h2>Video background</h2> + </section> + + <section data-background-iframe="https://slides.com"> + <h2>Iframe background</h2> + </section> + <section> <section data-background="#417203"> <h2>Same background twice vertical (1/2)</h2> @@ -101,7 +123,7 @@ </div> <script src="../../lib/js/head.min.js"></script> - <script src="../../js/reveal.min.js"></script> + <script src="../../js/reveal.js"></script> <script> diff --git a/test/examples/slide-transitions.html b/test/examples/slide-transitions.html new file mode 100644 index 0000000..88119dc --- /dev/null +++ b/test/examples/slide-transitions.html @@ -0,0 +1,101 @@ +<!doctype html> +<html lang="en"> + + <head> + <meta charset="utf-8"> + + <title>reveal.js - Slide Transitions</title> + + <link rel="stylesheet" href="../../css/reveal.css"> + <link rel="stylesheet" href="../../css/theme/white.css" id="theme"> + <style type="text/css" media="screen"> + .slides section.has-dark-background, + .slides section.has-dark-background h3 { + color: #fff; + } + .slides section.has-light-background, + .slides section.has-light-background h3 { + color: #222; + } + </style> + </head> + + <body> + + <div class="reveal"> + + <div class="slides"> + + <section> + <h3>Default</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + <section data-transition="zoom"> + <h3>data-transition: zoom</h3> + </section> + + <section data-transition="zoom-in fade-out"> + <h3>data-transition: zoom-in fade-out</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + <section data-transition="convex"> + <h3>data-transition: convex</h3> + </section> + + <section data-transition="convex-in concave-out"> + <h3>data-transition: convex-in concave-out</h3> + </section> + + <section> + <section data-transition="zoom"> + <h3>Default</h3> + </section> + <section data-transition="concave"> + <h3>data-transition: concave</h3> + </section> + <section data-transition="convex-in fade-out"> + <h3>data-transition: convex-in fade-out</h3> + </section> + <section> + <h3>Default</h3> + </section> + </section> + + <section data-transition="none"> + <h3>data-transition: none</h3> + </section> + + <section> + <h3>Default</h3> + </section> + + </div> + + </div> + + <script src="../../lib/js/head.min.js"></script> + <script src="../../js/reveal.js"></script> + + <script> + + Reveal.initialize({ + center: true, + history: true, + + // transition: 'slide', + // transitionSpeed: 'slow', + // backgroundTransition: 'slide' + }); + + </script> + + </body> +</html> |