Skip to content

Commit b9beee6

Browse files
EdDevEdDev
committed
Merge reveal.js 3.9.2
1 parent f9a5261 commit b9beee6

File tree

15 files changed

+717
-449
lines changed

15 files changed

+717
-449
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2019 Hakim El Hattab, http://hakim.se, and reveal.js contributors
1+
Copyright (C) 2020 Hakim El Hattab, http://hakim.se, and reveal.js contributors
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reveal.js",
3-
"version": "3.8.0",
3+
"version": "3.9.2",
44
"main": [
55
"js/reveal.js",
66
"css/reveal.css"

‎css/reveal.css‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://revealjs.com
44
* MIT licensed
55
*
6-
* Copyright (C) 2019 Hakim El Hattab, http://hakim.se
6+
* Copyright (C) 2020 Hakim El Hattab, http://hakim.se
77
*/
88
/*********************************************
99
* GLOBAL STYLES
@@ -77,29 +77,29 @@ body {
7777
text-decoration: line-through; }
7878

7979
.reveal .slides section .fragment.fade-up {
80-
-webkit-transform: translate(0, 20%);
81-
transform: translate(0, 20%); }
80+
-webkit-transform: translate(0, 40px);
81+
transform: translate(0, 40px); }
8282
.reveal .slides section .fragment.fade-up.visible {
8383
-webkit-transform: translate(0, 0);
8484
transform: translate(0, 0); }
8585

8686
.reveal .slides section .fragment.fade-down {
87-
-webkit-transform: translate(0, -20%);
88-
transform: translate(0, -20%); }
87+
-webkit-transform: translate(0, -40px);
88+
transform: translate(0, -40px); }
8989
.reveal .slides section .fragment.fade-down.visible {
9090
-webkit-transform: translate(0, 0);
9191
transform: translate(0, 0); }
9292

9393
.reveal .slides section .fragment.fade-right {
94-
-webkit-transform: translate(-20%, 0);
95-
transform: translate(-20%, 0); }
94+
-webkit-transform: translate(-40px, 0);
95+
transform: translate(-40px, 0); }
9696
.reveal .slides section .fragment.fade-right.visible {
9797
-webkit-transform: translate(0, 0);
9898
transform: translate(0, 0); }
9999

100100
.reveal .slides section .fragment.fade-left {
101-
-webkit-transform: translate(20%, 0);
102-
transform: translate(20%, 0); }
101+
-webkit-transform: translate(40px, 0);
102+
transform: translate(40px, 0); }
103103
.reveal .slides section .fragment.fade-left.visible {
104104
-webkit-transform: translate(0, 0);
105105
transform: translate(0, 0); }
@@ -227,7 +227,7 @@ body {
227227
bottom: 12px;
228228
right: 12px;
229229
left: auto;
230-
z-index: 1;
230+
z-index: 11;
231231
color: #000;
232232
pointer-events: none;
233233
font-size: 10px; }
@@ -312,7 +312,8 @@ body {
312312
transform: rotate(90deg); }
313313
.reveal .controls .navigate-down {
314314
right: 3.2em;
315-
bottom: 0;
315+
bottom: -1.4em;
316+
padding-bottom: 1.4em;
316317
-webkit-transform: translateY(10px);
317318
transform: translateY(10px); }
318319
.reveal .controls .navigate-down .controls-arrow {
@@ -395,18 +396,18 @@ body {
395396
right: auto; }
396397
.reveal .controls[data-controls-layout="edges"] .navigate-left {
397398
top: 50%;
398-
left: 8px;
399+
left: 0.8em;
399400
margin-top: -1.8em; }
400401
.reveal .controls[data-controls-layout="edges"] .navigate-right {
401402
top: 50%;
402-
right: 8px;
403+
right: 0.8em;
403404
margin-top: -1.8em; }
404405
.reveal .controls[data-controls-layout="edges"] .navigate-up {
405-
top: 8px;
406+
top: 0.8em;
406407
left: 50%;
407408
margin-left: -1.8em; }
408409
.reveal .controls[data-controls-layout="edges"] .navigate-down {
409-
bottom: 8px;
410+
bottom: -0.3em;
410411
left: 50%;
411412
margin-left: -1.8em; } }
412413

@@ -1453,9 +1454,16 @@ body {
14531454
text-align: right;
14541455
vertical-align: top; }
14551456

1456-
.reveal .hljs[data-line-numbers]:not([data-line-numbers=""]) tr:not(.highlight-line) {
1457+
.reveal .hljs.has-highlights tr:not(.highlight-line) {
14571458
opacity: 0.4; }
14581459

1460+
.reveal .hljs:not(:first-child).fragment {
1461+
position: absolute;
1462+
top: 0;
1463+
left: 0;
1464+
width: 100%;
1465+
box-sizing: border-box; }
1466+
14591467
/*********************************************
14601468
* ROLLING LINKS
14611469
*********************************************/

‎css/reveal.scss‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://revealjs.com
44
* MIT licensed
55
*
6-
* Copyright (C) 2019 Hakim El Hattab, http://hakim.se
6+
* Copyright (C) 2020 Hakim El Hattab, http://hakim.se
77
*/
88

99

@@ -102,31 +102,31 @@ body {
102102
}
103103

104104
.reveal .slides section .fragment.fade-up {
105-
transform: translate(0, 20%);
105+
transform: translate(0, 40px);
106106

107107
&.visible {
108108
transform: translate(0, 0);
109109
}
110110
}
111111

112112
.reveal .slides section .fragment.fade-down {
113-
transform: translate(0, -20%);
113+
transform: translate(0, -40px);
114114

115115
&.visible {
116116
transform: translate(0, 0);
117117
}
118118
}
119119

120120
.reveal .slides section .fragment.fade-right {
121-
transform: translate(-20%, 0);
121+
transform: translate(-40px, 0);
122122

123123
&.visible {
124124
transform: translate(0, 0);
125125
}
126126
}
127127

128128
.reveal .slides section .fragment.fade-left {
129-
transform: translate(20%, 0);
129+
transform: translate(40px, 0);
130130

131131
&.visible {
132132
transform: translate(0, 0);
@@ -263,7 +263,7 @@ $controlsArrowAngleActive: 36deg;
263263
bottom: $spacing;
264264
right: $spacing;
265265
left: auto;
266-
z-index: 1;
266+
z-index: 11;
267267
color: #000;
268268
pointer-events: none;
269269
font-size: 10px;
@@ -355,7 +355,8 @@ $controlsArrowAngleActive: 36deg;
355355

356356
.navigate-down {
357357
right: $controlArrowSpacing + $controlArrowSize/2;
358-
bottom: 0;
358+
bottom: -$controlArrowSpacing;
359+
padding-bottom: $controlArrowSpacing;
359360
transform: translateY( 10px );
360361

361362
.controls-arrow {
@@ -452,7 +453,7 @@ $controlsArrowAngleActive: 36deg;
452453
// Edge aligned controls layout
453454
@media screen and (min-width: 500px) {
454455

455-
$spacing: 8px;
456+
$spacing: 0.8em;
456457

457458
.reveal .controls[data-controls-layout="edges"] {
458459
& {
@@ -489,7 +490,7 @@ $controlsArrowAngleActive: 36deg;
489490
}
490491

491492
.navigate-down {
492-
bottom: $spacing;
493+
bottom: $spacing - $controlArrowSpacing + 0.3em;
493494
left: 50%;
494495
margin-left: -$controlArrowSize/2;
495496
}
@@ -1590,10 +1591,18 @@ $controlsArrowAngleActive: 36deg;
15901591
vertical-align: top;
15911592
}
15921593

1593-
.reveal .hljs[data-line-numbers]:not([data-line-numbers=""]) tr:not(.highlight-line) {
1594+
.reveal .hljs.has-highlights tr:not(.highlight-line) {
15941595
opacity: 0.4;
15951596
}
15961597

1598+
.reveal .hljs:not(:first-child).fragment {
1599+
position: absolute;
1600+
top: 0;
1601+
left: 0;
1602+
width: 100%;
1603+
box-sizing: border-box;
1604+
}
1605+
15971606

15981607
/*********************************************
15991608
* ROLLING LINKS

‎css/theme/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Themes are written using Sass to keep things modular and reduce the need for rep
44

55
## Creating a Theme
66

7-
To create your own theme, start by duplicating a ```.scss``` file in [/css/theme/source](https://github.com/hakimel/reveal.js/blob/master/css/theme/source). It will be automatically compiled by Grunt from Sass to CSS (see the [Gruntfile](https://github.com/hakimel/reveal.js/blob/master/Gruntfile.js)) when you run `npm run build -- css-themes`.
7+
To create your own theme, start by duplicating a ```.scss``` file in [/css/theme/source](https://github.com/hakimel/reveal.js/blob/master/css/theme/source). It will be automatically compiled by Grunt from Sass to CSS (see the [Gruntfile](https://github.com/hakimel/reveal.js/blob/master/gruntfile.js)) when you run `npm run build -- css-themes`.
88

99
Each theme file does four things in the following order:
1010

‎demo.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ <h2>Iframe Backgrounds</h2>
241241

242242
<section>
243243
<h2>Pretty Code</h2>
244-
<pre><code class="hljs" data-trim data-line-numbers="4,8-11">
244+
<pre><code class="hljs" data-trim data-line-numbers="4|9|4,8-11">
245245
import React, { useState } from 'react';
246246

247247
function Example() {
@@ -412,7 +412,7 @@ <h1>THE END</h1>
412412
dependencies: [
413413
{ src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
414414
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
415-
{ src: 'plugin/highlight/highlight.js', async: true },
415+
{ src: 'plugin/highlight/highlight.js' },
416416
{ src: 'plugin/search/search.js', async: true },
417417
{ src: 'plugin/zoom-js/zoom.js', async: true },
418418
{ src: 'plugin/notes/notes.js', async: true }

‎gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = grunt => {
1919
' * http://revealjs.com\n' +
2020
' * MIT licensed\n' +
2121
' *\n' +
22-
' * Copyright (C) 2019 Hakim El Hattab, http://hakim.se\n' +
22+
' * Copyright (C) 2020 Hakim El Hattab, http://hakim.se\n' +
2323
' */'
2424
},
2525

‎index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
// - https://github.com/hakimel/reveal.js#configuration
3939
// - https://github.com/hakimel/reveal.js#dependencies
4040
Reveal.initialize({
41+
hash: true,
4142
dependencies: [
4243
{ src: 'plugin/markdown/marked.js' },
4344
{ src: 'plugin/markdown/markdown.js' },
44-
{ src: 'plugin/notes/notes.js', async: true },
45-
{ src: 'plugin/highlight/highlight.js', async: true }
45+
{ src: 'plugin/highlight/highlight.js' },
46+
{ src: 'plugin/notes/notes.js', async: true }
4647
]
4748
});
4849
</script>

0 commit comments

Comments
 (0)