xobs/lca20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Chris Lawrence 2013-07-22 05:39:20 -04:00
commit 4874b13f91
8 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
README.md
View File

@ -7,7 +7,7 @@ reveal.js comes with a broad range of features including [nested slides](https:/
#### More reading: #### More reading:
- [Installation](#installation): Step-by-step instructions for getting reveal.js running on your computer. - [Installation](#installation): Step-by-step instructions for getting reveal.js running on your computer.
- [Changelog](https://github.com/hakimel/reveal.js/wiki/Changelog): Up-to-date version history. - [Changelog](https://github.com/hakimel/reveal.js/releases): Up-to-date version history.
- [Examples](https://github.com/hakimel/reveal.js/wiki/Example-Presentations): Presentations created with reveal.js, add your own! - [Examples](https://github.com/hakimel/reveal.js/wiki/Example-Presentations): Presentations created with reveal.js, add your own!
- [Browser Support](https://github.com/hakimel/reveal.js/wiki/Browser-Support): Explanation of browser support and fallbacks. - [Browser Support](https://github.com/hakimel/reveal.js/wiki/Browser-Support): Explanation of browser support and fallbacks.
@ -77,6 +77,9 @@ Reveal.initialize({
// Enable keyboard shortcuts for navigation // Enable keyboard shortcuts for navigation
keyboard: true, keyboard: true,
// Enable touch events for navigation
touch: true,
// Enable the slide overview mode // Enable the slide overview mode
overview: true, overview: true,
@ -630,7 +633,7 @@ The **basic setup** is for authoring presentations only. The **full setup** give
The core of reveal.js is very easy to install. You'll simply need to download a copy of this repository and open the index.html file directly in your browser. The core of reveal.js is very easy to install. You'll simply need to download a copy of this repository and open the index.html file directly in your browser.
1. Download a copy of reveal.js from <https://github.com/hakimel/reveal.js/archive/master.zip> 1. Download the latest version of reveal.js from <https://github.com/hakimel/reveal.js/releases>
2. Unzip and replace the example contents in index.html with your own 2. Unzip and replace the example contents in index.html with your own
@ -650,17 +653,22 @@ Some reveal.js features, like external markdown, require that presentations run
$ git clone git@github.com:hakimel/reveal.js.git $ git clone git@github.com:hakimel/reveal.js.git
``` ```
5. Install dependencies 5. Navigate to the reveal.js folder
```
$ cd reveal.js
```
6. Install dependencies
``` ```
$ npm install $ npm install
``` ```
6. Serve the presentation and monitor source files for changes 7. Serve the presentation and monitor source files for changes
``` ```
$ grunt serve $ grunt serve
``` ```
7. Open <http://localhost:8000> to view your presentation 8. Open <http://localhost:8000> to view your presentation
### Folder Structure ### Folder Structure

4
css/theme/README.md
View File

@ -1,6 +1,6 @@
## Dependencies ## Dependencies
Themes are written using Sass to keep things modular and reduce the need for repeated selectors across files. Make sure that you have the reveal.js development environment including the Grunt dependencies installed before proceding: https://github.com/hakimel/reveal.js#development-environment Themes are written using Sass to keep things modular and reduce the need for repeated selectors across files. Make sure that you have the reveal.js development environment including the Grunt dependencies installed before proceding: https://github.com/hakimel/reveal.js#full-setup
@ -20,4 +20,4 @@ Declares a set of custom variables that the template file (step 4) expects. Can
This is where you override the default theme. Either by specifying variables (see [settings.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/settings.scss) for reference) or by adding full selectors with hardcoded styles. This is where you override the default theme. Either by specifying variables (see [settings.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/settings.scss) for reference) or by adding full selectors with hardcoded styles.
4. **Include [/css/theme/template/theme.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/theme.scss)** 4. **Include [/css/theme/template/theme.scss](https://github.com/hakimel/reveal.js/blob/master/css/theme/template/theme.scss)**
The template theme file which will generate final CSS output based on the currently defined variables. The template theme file which will generate final CSS output based on the currently defined variables.

0
test/assets/image1.png → examples/assets/image1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
test/assets/image2.png → examples/assets/image2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

42
examples/barebones.html Normal file
View File

@ -0,0 +1,42 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>reveal.js - Barebones</title>
<link rel="stylesheet" href="../css/reveal.min.css">
</head>
<body>
<div class="reveal">
<div class="slides">
<section>
<h2>Barebones Presentation</h2>
<p>This example contains the bare minimum includes and markup required to run a reveal.js presentation.</p>
</section>
<section>
<h2>No Theme</h2>
<p>There's no theme included, so it will fall back on browser defaults.</p>
</section>
</div>
</div>
<script src="../lib/js/head.min.js"></script>
<script src="../js/reveal.min.js"></script>
<script>
Reveal.initialize();
</script>
</body>
</html>

13
test/media.html → examples/embedded-media.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>reveal.js - Test</title> <title>reveal.js - Embedded Media</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@ -39,17 +39,8 @@
<script> <script>
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({ Reveal.initialize({
controls: true, transition: 'linear'
progress: true,
history: true,
center: true,
transition: 'linear',
// transitionSpeed: 'slow',
// backgroundTransition: 'linear'
}); });
</script> </script>

16
test/background.html → examples/slide-backgrounds.html
View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>reveal.js - Test</title> <title>reveal.js - Slide Backgrounds</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@ -50,10 +50,19 @@
</section> </section>
</section> </section>
<section data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)"> <section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)">
<h2>Background image</h2> <h2>Background image</h2>
</section> </section>
<section>
<section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)">
<h2>Background image</h2>
</section>
<section data-background-transition="slide" data-background="assets/image1.png" style="background: rgba(255,255,255,0.9)">
<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" style="background: rgba(255,255,255,0.9)">
<h2>Background image</h2> <h2>Background image</h2>
<pre>data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"</pre> <pre>data-background-size="100px" data-background-repeat="repeat" data-background-color="#111"</pre>
@ -78,9 +87,6 @@
// Full list of configuration options available here: // Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration // https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({ Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true, center: true,
// rtl: true, // rtl: true,

12
js/reveal.js
View File

@ -1918,11 +1918,11 @@ var Reveal = (function(){
toArray( fragments ).forEach( function( element ) { toArray( fragments ).forEach( function( element ) {
element.classList.add( 'visible' ); element.classList.add( 'visible' );
// Notify subscribers of the change
dispatchEvent( 'fragmentshown', { fragment: element } );
} ); } );
// Notify subscribers of the change
dispatchEvent( 'fragmentshown', { fragment: fragments[0], fragments: fragments } );
updateControls(); updateControls();
return true; return true;
} }
@ -1952,11 +1952,11 @@ var Reveal = (function(){
toArray( fragments ).forEach( function( f ) { toArray( fragments ).forEach( function( f ) {
f.classList.remove( 'visible' ); f.classList.remove( 'visible' );
// Notify subscribers of the change
dispatchEvent( 'fragmenthidden', { fragment: f } );
} ); } );
// Notify subscribers of the change
dispatchEvent( 'fragmenthidden', { fragment: fragments[0], fragments: fragments } );
updateControls(); updateControls();
return true; return true;
} }