Skip to content

Commit

Permalink
updated to reveal.js 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bkimminich committed Dec 21, 2015
1 parent 0da0a0c commit a8bddaa
Show file tree
Hide file tree
Showing 38 changed files with 1,393 additions and 753 deletions.
17 changes: 2 additions & 15 deletions .travis.yml
@@ -1,18 +1,5 @@
language: node_js
node_js:
- 0.10
env:
global:
- secure: IEV76JVcHnkUhg+6UZtbaAjNL7Q/XCyhokxGLA9vyhceyquY206+6Ess/Femmabnco+vo0/ALkVS3vzZIyaljZTa8xySFe0BcIrGFrlsrNgMoUBOC7LKGimSSp7Efs3xjjkCtyQjbKodOLvwaP/CMqSA25avWeoaWcd5y+nzc+w=
- secure: sW/qSe9Cn9hctKJKueEK94C+RZB3GkqNDtWs9dkBBQWFS6DSuTJ8qvmI8TczlO5S9o3XtM/m17g5hZS/HTwTQG8WvnNZvAuq2+R7Efzi9xR4z6mAycaiigEnlwDexhF9L6cmNqNw/HEeXUf4Z1dLiVSltn/vKHQzSk1No8UERYo=
- 4.1.1
before_script:
- npm install -g grunt-cli
- sudo apt-get install wput
after_script:
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput index.html ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput assets ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput css ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput js ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput lib ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && wput plugin ftp://$FTP_USER:$FTP_PASSWORD@ftp.strato.de/webappsec-nutshell/ -u
sudo: required
- npm install -g grunt-cli
10 changes: 8 additions & 2 deletions Gruntfile.js
@@ -1,6 +1,8 @@
/* global module:false */
module.exports = function(grunt) {
var port = grunt.option('port') || 8000;
var base = grunt.option('base') || '.';

// Project configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
Expand Down Expand Up @@ -91,7 +93,7 @@ module.exports = function(grunt) {
server: {
options: {
port: port,
base: '.',
base: base,
livereload: true,
open: true
}
Expand All @@ -105,7 +107,8 @@ module.exports = function(grunt) {
'js/**',
'lib/**',
'images/**',
'plugin/**'
'plugin/**',
'**.md'
]
},

Expand All @@ -127,6 +130,9 @@ module.exports = function(grunt) {
},
html: {
files: [ 'index.html']
},
markdown: {
files: [ './*.md' ]
}
}

Expand Down
6 changes: 2 additions & 4 deletions LICENSE.md → LICENSE
@@ -1,6 +1,4 @@
The MIT License (MIT)

Copyright (c) 2014 Bjoern Kimminich
Copyright (C) 2015 Hakim El Hattab, http://hakim.se

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
6 changes: 2 additions & 4 deletions README.md
Expand Up @@ -39,8 +39,6 @@ An ultra-compact intro (or refresher) to Web Application Security derived from m
- Based on free material provided by the [Open Web Application Security Project (OWASP)](https://owasp.org)
- Background image based on [Digital Shodan](http://sephiroth-kmfdm.deviantart.com/art/Digital-Shodan-56013493) by [sephiroth-kmfdm](http://sephiroth-kmfdm.deviantart.com/)

## License
## Copyright

MIT licensed

Copyright (C) 2014 Bjoern Kimminich, http://kimminich.de
Copyright (C) 2015 Bjoern Kimminich, http://kimminich.de
27 changes: 27 additions & 0 deletions bower.json
@@ -0,0 +1,27 @@
{
"name": "reveal.js",
"version": "3.2.0",
"main": [
"js/reveal.js",
"css/reveal.css"
],
"homepage": "http://lab.hakim.se/reveal-js/",
"license": "MIT",
"description": "The HTML Presentation Framework",
"authors": [
"Hakim El Hattab <hakim.elhattab@gmail.com>"
],
"dependencies": {
"headjs": "~1.0.3"
},
"repository": {
"type": "git",
"url": "git://github.com/hakimel/reveal.js.git"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test"
]
}
2 changes: 1 addition & 1 deletion css/print/paper.css
Expand Up @@ -141,7 +141,7 @@
.reveal .slides section {
visibility: visible !important;
position: static !important;
width: 100% !important;
width: auto !important;
height: auto !important;
display: block !important;
overflow: visible !important;
Expand Down
57 changes: 30 additions & 27 deletions css/print/pdf.css
@@ -1,15 +1,9 @@
/* Default Print Stylesheet Template
by Rob Glazebrook of CSSnewbie.com
Last Updated: June 4, 2008
Feel free (nay, compelled) to edit, append, and
manipulate this file as you see fit. */


/* SECTION 1: Set default width, margin, float, and
background. This prevents elements from extending
beyond the edge of the printed page, and prevents
unnecessary background images from printing */
/**
* This stylesheet is used to print reveal.js
* presentations to PDF.
*
* https://github.com/hakimel/reveal.js#pdf-export
*/

* {
-webkit-print-color-adjust: exact;
Expand All @@ -29,12 +23,10 @@ html {
overflow: visible;
}

/* SECTION 2: Remove any elements not needed in print.
This would include navigation, ads, sidebars, etc. */
/* Remove any elements not needed in print. */
.nestedarrow,
.reveal .controls,
.reveal .progress,
.reveal .slide-number,
.reveal .playback,
.reveal.overview,
.fork-reveal,
Expand All @@ -43,16 +35,7 @@ html {
display: none !important;
}

/* SECTION 3: Set body font face, size, and color.
Consider using a serif font for readability. */
body, p, td, li, div {

}

/* SECTION 4: Set heading font face, sizes, and color.
Differentiate your headings from your body text.
Perhaps use a large sans-serif for distinction. */
h1,h2,h3,h4,h5,h6 {
h1, h2, h3, h4, h5, h6 {
text-shadow: 0 0 0 #000 !important;
}

Expand All @@ -61,8 +44,6 @@ h1,h2,h3,h4,h5,h6 {
font-family: Courier, 'Courier New', monospace !important;
}


/* SECTION 5: more reveal.js specific additions by @skypanther */
ul, ol, div, p {
visibility: visible;
position: static;
Expand Down Expand Up @@ -100,6 +81,7 @@ ul, ol, div, p {
-ms-perspective-origin: 50% 50%;
perspective-origin: 50% 50%;
}

.reveal .slides section {
page-break-after: always !important;

Expand All @@ -125,16 +107,19 @@ ul, ol, div, p {
-ms-transform: none !important;
transform: none !important;
}

.reveal section.stack {
margin: 0 !important;
padding: 0 !important;
page-break-after: avoid !important;
height: auto !important;
min-height: auto !important;
}

.reveal img {
box-shadow: none;
}

.reveal .roll {
overflow: visible;
line-height: 1em;
Expand All @@ -149,9 +134,27 @@ ul, ol, div, p {
width: 100%;
z-index: -1;
}

/* All elements should be above the slide-background */
.reveal section>* {
position: relative;
z-index: 1;
}

/* Display slide speaker notes when 'showNotes' is enabled */
.reveal .speaker-notes-pdf {
display: block;
width: 100%;
max-height: none;
left: auto;
top: auto;
z-index: 100;
}

/* Display slide numbers when 'slideNumber' is enabled */
.reveal .slide-number-pdf {
display: block;
position: absolute;
font-size: 14px;
}

0 comments on commit a8bddaa

Please sign in to comment.