Revert reveal.js upgrade

(font size increase breaks layout)
bkimminich · Oct 3, 2017 · cf92c2a · cf92c2a
1 parent 1b4fcbf
commit cf92c2a
Show file tree

Hide file tree

Showing 44 changed files with 738 additions and 2,026 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,9 +1,7 @@
 /* global module:false */
 module.exports = function(grunt) {
 	var port = grunt.option('port') || 8000;
-	var root = grunt.option('root') || '.';
-
-	if (!Array.isArray(root)) root = [root];
+	var base = grunt.option('base') || '.';
 
 	// Project configuration
 	grunt.initConfig({
@@ -15,7 +13,7 @@ module.exports = function(grunt) {
 				' * http://lab.hakim.se/reveal-js\n' +
 				' * MIT licensed\n' +
 				' *\n' +
-				' * Copyright (C) 2017 Hakim El Hattab, http://hakim.se\n' +
+				' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' +
 				' */'
 		},
 
@@ -44,7 +42,7 @@ module.exports = function(grunt) {
 					{
 						expand: true,
 						cwd: 'css/theme/source',
-						src: ['*.sass', '*.scss'],
+						src: ['*.scss'],
 						dest: 'css/theme',
 						ext: '.css'
 					}
@@ -71,7 +69,6 @@ module.exports = function(grunt) {
 				curly: false,
 				eqeqeq: true,
 				immed: true,
-				esnext: true,
 				latedef: true,
 				newcap: true,
 				noarg: true,
@@ -96,12 +93,11 @@ module.exports = function(grunt) {
 			server: {
 				options: {
 					port: port,
-					base: root,
+					base: base,
 					livereload: true,
 					open: true
 				}
-			},
-
+			}
 		},
 
 		zip: {
@@ -117,38 +113,27 @@ module.exports = function(grunt) {
 		},
 
 		watch: {
+			options: {
+				livereload: true
+			},
 			js: {
 				files: [ 'Gruntfile.js', 'js/reveal.js' ],
 				tasks: 'js'
 			},
 			theme: {
-				files: [
-					'css/theme/source/*.sass',
-					'css/theme/source/*.scss',
-					'css/theme/template/*.sass',
-					'css/theme/template/*.scss'
-				],
+				files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
 				tasks: 'css-themes'
 			},
 			css: {
 				files: [ 'css/reveal.scss' ],
 				tasks: 'css-core'
 			},
 			html: {
-				files: root.map(path => path + '/*.html')
+				files: [ 'index.html']
 			},
 			markdown: {
-				files: root.map(path => path + '/*.md')
-			},
-			options: {
-				livereload: true
+				files: [ './*.md' ]
 			}
-		},
-
-		retire: {
-			js: ['js/reveal.js', 'lib/js/*.js', 'plugin/**/*.js'],
-			node: ['.'],
-			options: {}
 		}
 
 	});
@@ -163,7 +148,6 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks( 'grunt-contrib-connect' );
 	grunt.loadNpmTasks( 'grunt-autoprefixer' );
 	grunt.loadNpmTasks( 'grunt-zip' );
-	grunt.loadNpmTasks( 'grunt-retire' );
 
 	// Default task
 	grunt.registerTask( 'default', [ 'css', 'js' ] );

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2017 Hakim El Hattab, http://hakim.se, and reveal.js contributors
+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

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "reveal.js",
-  "version": "3.5.0",
+  "version": "3.2.0",
   "main": [
     "js/reveal.js",
     "css/reveal.css"

diff --git a/css/print/paper.css b/css/print/paper.css
@@ -38,8 +38,7 @@
 	.share-reveal,
 	.state-background,
 	.reveal .progress,
-	.reveal .backgrounds,
-	.reveal .slide-number {
+	.reveal .backgrounds {
 		display: none !important;
 	}
 
@@ -200,4 +199,4 @@
 		font-size: 0.8em;
 	}
 
-}
+}
diff --git a/css/print/pdf.css b/css/print/pdf.css
@@ -60,9 +60,8 @@ ul, ol, div, p {
 }
 .reveal .slides {
 	position: static;
-	width: 100% !important;
-	height: auto !important;
-	zoom: 1 !important;
+	width: 100%;
+	height: auto;
 
 	left: auto;
 	top: auto;
@@ -83,18 +82,13 @@ ul, ol, div, p {
 	        perspective-origin: 50% 50%;
 }
 
-.reveal .slides .pdf-page {
-	position: relative;
-	overflow: hidden;
-	z-index: 1;
-
-	page-break-after: always;
-}
-
 .reveal .slides section {
+	page-break-after: always !important;
+
 	visibility: visible !important;
+	position: relative !important;
 	display: block !important;
-	position: absolute !important;
+	position: relative !important;
 
 	margin: 0 !important;
 	padding: 0 !important;
@@ -115,7 +109,6 @@ ul, ol, div, p {
 }
 
 .reveal section.stack {
-	position: relative !important;
 	margin: 0 !important;
 	padding: 0 !important;
 	page-break-after: avoid !important;
@@ -133,40 +126,35 @@ ul, ol, div, p {
 }
 
 /* Slide backgrounds are placed inside of their slide when exporting to PDF */
-.reveal .slide-background {
+.reveal section .slide-background {
 	display: block !important;
 	position: absolute;
 	top: 0;
 	left: 0;
 	width: 100%;
-	height: 100%;
-	z-index: auto !important;
+	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;
-	top: auto;
-	right: auto;
-	bottom: auto;
 	left: auto;
+	top: auto;
 	z-index: 100;
 }
 
-/* Layout option which makes notes appear on a separate page */
-.reveal .speaker-notes-pdf[data-layout="separate-page"] {
-	position: relative;
-	color: inherit;
-	background-color: transparent;
-	padding: 20px;
-	page-break-after: always;
-}
-
 /* Display slide numbers when 'slideNumber' is enabled */
 .reveal .slide-number-pdf {
 	display: block;
 	position: absolute;
 	font-size: 14px;
 }
+