Skip to content

Commit

Permalink
Merge branch 'dev' into plugin-markdown
Browse files Browse the repository at this point in the history
  • Loading branch information
@hakimel
hakimel authored May 17, 2021
2 parents 00acc73 + 7daea49 commit 03126c5
Show file tree
Hide file tree
Showing 39 changed files with 5,718 additions and 5,833 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Want to create your presentation using a visual editor? Try the official reveal.

MIT licensed

Copyright (C) 2011-2020 Hakim El Hattab, https://hakim.se
Copyright (C) 2011-2021 Hakim El Hattab, https://hakim.se
38 changes: 19 additions & 19 deletions css/reveal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,109 +1158,109 @@ $controlsArrowAngleActive: 36deg;
}

/* Immediate transition style */
.reveal[data-background-transition=none]>.backgrounds .slide-background,
.reveal[data-background-transition=none]>.backgrounds .slide-background:not([data-background-transition]),
.reveal>.backgrounds .slide-background[data-background-transition=none] {
transition: none;
}

/* Slide */
.reveal[data-background-transition=slide]>.backgrounds .slide-background,
.reveal[data-background-transition=slide]>.backgrounds .slide-background:not([data-background-transition]),
.reveal>.backgrounds .slide-background[data-background-transition=slide] {
opacity: 1;
backface-visibility: hidden;
}
.reveal[data-background-transition=slide]>.backgrounds .slide-background.past,
.reveal[data-background-transition=slide]>.backgrounds .slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background.past[data-background-transition=slide] {
transform: translate(-100%, 0);
}
.reveal[data-background-transition=slide]>.backgrounds .slide-background.future,
.reveal[data-background-transition=slide]>.backgrounds .slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background.future[data-background-transition=slide] {
transform: translate(100%, 0);
}

.reveal[data-background-transition=slide]>.backgrounds .slide-background>.slide-background.past,
.reveal[data-background-transition=slide]>.backgrounds .slide-background>.slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.past[data-background-transition=slide] {
transform: translate(0, -100%);
}
.reveal[data-background-transition=slide]>.backgrounds .slide-background>.slide-background.future,
.reveal[data-background-transition=slide]>.backgrounds .slide-background>.slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.future[data-background-transition=slide] {
transform: translate(0, 100%);
}


/* Convex */
.reveal[data-background-transition=convex]>.backgrounds .slide-background.past,
.reveal[data-background-transition=convex]>.backgrounds .slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background.past[data-background-transition=convex] {
opacity: 0;
transform: translate3d(-100%, 0, 0) rotateY(-90deg) translate3d(-100%, 0, 0);
}
.reveal[data-background-transition=convex]>.backgrounds .slide-background.future,
.reveal[data-background-transition=convex]>.backgrounds .slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background.future[data-background-transition=convex] {
opacity: 0;
transform: translate3d(100%, 0, 0) rotateY(90deg) translate3d(100%, 0, 0);
}

.reveal[data-background-transition=convex]>.backgrounds .slide-background>.slide-background.past,
.reveal[data-background-transition=convex]>.backgrounds .slide-background>.slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.past[data-background-transition=convex] {
opacity: 0;
transform: translate3d(0, -100%, 0) rotateX(90deg) translate3d(0, -100%, 0);
}
.reveal[data-background-transition=convex]>.backgrounds .slide-background>.slide-background.future,
.reveal[data-background-transition=convex]>.backgrounds .slide-background>.slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.future[data-background-transition=convex] {
opacity: 0;
transform: translate3d(0, 100%, 0) rotateX(-90deg) translate3d(0, 100%, 0);
}


/* Concave */
.reveal[data-background-transition=concave]>.backgrounds .slide-background.past,
.reveal[data-background-transition=concave]>.backgrounds .slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background.past[data-background-transition=concave] {
opacity: 0;
transform: translate3d(-100%, 0, 0) rotateY(90deg) translate3d(-100%, 0, 0);
}
.reveal[data-background-transition=concave]>.backgrounds .slide-background.future,
.reveal[data-background-transition=concave]>.backgrounds .slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background.future[data-background-transition=concave] {
opacity: 0;
transform: translate3d(100%, 0, 0) rotateY(-90deg) translate3d(100%, 0, 0);
}

.reveal[data-background-transition=concave]>.backgrounds .slide-background>.slide-background.past,
.reveal[data-background-transition=concave]>.backgrounds .slide-background>.slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.past[data-background-transition=concave] {
opacity: 0;
transform: translate3d(0, -100%, 0) rotateX(-90deg) translate3d(0, -100%, 0);
}
.reveal[data-background-transition=concave]>.backgrounds .slide-background>.slide-background.future,
.reveal[data-background-transition=concave]>.backgrounds .slide-background>.slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.future[data-background-transition=concave] {
opacity: 0;
transform: translate3d(0, 100%, 0) rotateX(90deg) translate3d(0, 100%, 0);
}

/* Zoom */
.reveal[data-background-transition=zoom]>.backgrounds .slide-background,
.reveal[data-background-transition=zoom]>.backgrounds .slide-background:not([data-background-transition]),
.reveal>.backgrounds .slide-background[data-background-transition=zoom] {
transition-timing-function: ease;
}

.reveal[data-background-transition=zoom]>.backgrounds .slide-background.past,
.reveal[data-background-transition=zoom]>.backgrounds .slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background.past[data-background-transition=zoom] {
opacity: 0;
visibility: hidden;
transform: scale(16);
}
.reveal[data-background-transition=zoom]>.backgrounds .slide-background.future,
.reveal[data-background-transition=zoom]>.backgrounds .slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background.future[data-background-transition=zoom] {
opacity: 0;
visibility: hidden;
transform: scale(0.2);
}

.reveal[data-background-transition=zoom]>.backgrounds .slide-background>.slide-background.past,
.reveal[data-background-transition=zoom]>.backgrounds .slide-background>.slide-background.past:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.past[data-background-transition=zoom] {
opacity: 0;
visibility: hidden;
transform: scale(16);
}
.reveal[data-background-transition=zoom]>.backgrounds .slide-background>.slide-background.future,
.reveal[data-background-transition=zoom]>.backgrounds .slide-background>.slide-background.future:not([data-background-transition]),
.reveal>.backgrounds .slide-background>.slide-background.future[data-background-transition=zoom] {
opacity: 0;
visibility: hidden;
Expand Down
1 change: 1 addition & 0 deletions css/theme/template/theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
.reveal code {
font-family: $codeFont;
text-transform: none;
tab-size: 2;
}

.reveal pre code {
Expand Down
26 changes: 13 additions & 13 deletions demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<link rel="stylesheet" href="dist/theme/black.css" id="theme">

<!-- Theme used for syntax highlighting of code -->
<link rel="stylesheet" href="plugin/highlight/monokai.css" id="highlight-theme">
<link rel="stylesheet" href="plugin/highlight/monokai.css">
</head>

<body>
Expand Down Expand Up @@ -186,7 +186,7 @@ <h2>Touch Optimized</h2>
Write content using inline or external Markdown.
Instructions and more info available in the [docs](https://revealjs.com/markdown/).

```[]
```html []
<section data-markdown>
## Markdown support
Expand Down Expand Up @@ -249,17 +249,17 @@ <h2>Themes</h2>
<p>
reveal.js comes with a few themes built in: <br>
<!-- Hacks to swap themes after the page has loaded. Not flexible and only intended for the reveal.js demo deck. -->
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/black.css'); return false;">Black (default)</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/white.css'); return false;">White</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/league.css'); return false;">League</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/sky.css'); return false;">Sky</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/beige.css'); return false;">Beige</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/simple.css'); return false;">Simple</a> <br>
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/serif.css'); return false;">Serif</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/blood.css'); return false;">Blood</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/night.css'); return false;">Night</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/moon.css'); return false;">Moon</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','css/theme/solarized.css'); return false;">Solarized</a>
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/black.css'); return false;">Black (default)</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/white.css'); return false;">White</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/league.css'); return false;">League</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/sky.css'); return false;">Sky</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/beige.css'); return false;">Beige</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/simple.css'); return false;">Simple</a> <br>
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/serif.css'); return false;">Serif</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/blood.css'); return false;">Blood</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/night.css'); return false;">Night</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/moon.css'); return false;">Moon</a> -
<a href="#" onclick="document.getElementById('theme').setAttribute('href','dist/theme/solarized.css'); return false;">Solarized</a>
</p>
</section>

Expand Down
4 changes: 2 additions & 2 deletions dist/reveal.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/reveal.esm.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/reveal.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/theme/beige.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/black.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ section.has-light-background, section.has-light-background h1, section.has-light

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/blood.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ section.has-light-background, section.has-light-background h1, section.has-light

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/league.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ section.has-light-background, section.has-light-background h1, section.has-light

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/moon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ section.has-light-background, section.has-light-background h1, section.has-light

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/night.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ section.has-light-background, section.has-light-background h1, section.has-light

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/serif.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/simple.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/sky.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/solarized.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ html * {

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion dist/theme/white.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ section.has-dark-background, section.has-dark-background h1, section.has-dark-ba

.reveal code {
font-family: monospace;
text-transform: none; }
text-transform: none;
tab-size: 2; }

.reveal pre code {
display: block;
Expand Down
2 changes: 2 additions & 0 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const banner = `/*!
* Copyright (C) 2020 Hakim El Hattab, https://hakim.se
*/\n`

sass.compiler = require('node-sass');

// Prevents warnings from opening too many test pages
process.setMaxListeners(20);

Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<link rel="stylesheet" href="dist/reset.css">
<link rel="stylesheet" href="dist/reveal.css">
<link rel="stylesheet" href="dist/theme/black.css" id="theme">
<link rel="stylesheet" href="dist/theme/black.css">

<!-- Theme used for syntax highlighted code -->
<link rel="stylesheet" href="plugin/highlight/monokai.css" id="highlight-theme">
<link rel="stylesheet" href="plugin/highlight/monokai.css">
</head>
<body>
<div class="reveal">
Expand Down
6 changes: 3 additions & 3 deletions js/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ export default {

// Optional function that blocks keyboard events when retuning false
//
// If you set this to 'foucsed', we will only capture keyboard events
// for embdedded decks when they are in focus
// If you set this to 'focused', we will only capture keyboard events
// for embedded decks when they are in focus
keyboardCondition: null,

// Disables the default reveal.js slide layout (scaling and centering)
Expand Down Expand Up @@ -149,7 +149,7 @@ export default {
// Flags if slides with data-visibility="hidden" should be kep visible
showHiddenSlides: false,

// Global override for autolaying embedded media (video/audio/iframe)
// Global override for autoplaying embedded media (video/audio/iframe)
// - null: Media will only autoplay if data-autoplay is present
// - true: All media will autoplay, regardless of individual setting
// - false: No media will autoplay, regardless of individual setting
Expand Down
Loading

0 comments on commit 03126c5

Please sign in to comment.