Merge branch 'hakimel:master' into theme

bfh · Sep 8, 2023 · 11397ba · 11397ba
2 parents f47bb25 + 03fe25c
commit 11397ba
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 133 deletions.
diff --git a/css/print/pdf.scss b/css/print/pdf.scss
@@ -36,7 +36,6 @@ html.print-pdf {
 
 	.reveal pre code {
 		overflow: hidden !important;
-		font-family: Courier, 'Courier New', monospace !important;
 	}
 
 	.reveal {

diff --git a/css/theme/source/dracula.scss b/css/theme/source/dracula.scss
@@ -86,47 +86,21 @@ $codeFont: "Fira Code", $systemFontsMono;
 	--r-list-bullet-color: #{$listBulletColor};
 }
 
-.reveal strong, .reveal b {
-	color: var(--r-bold-color);
+.reveal {
+	strong, b {
+		color: var(--r-bold-color);
+	}
+	em, i, blockquote {
+		color: var(--r-italic-color);
+	}
+	code {
+		color: var(--r-inline-code-color);
+	}
+	// Dracula colored list bullets and numbers
+	ul, ol {
+		li::marker {
+			color: var(--r-list-bullet-color);
+		}
+	}
 }
 
-.reveal em, .reveal i, .reveal blockquote {
-	color: var(--r-italic-color);
-}
-
-.reveal code {
-	color: var(--r-inline-code-color);
-}
-
-// Dracula colored list bullets and numbers
-.reveal ul {
-	list-style: none;
-}
-
-.reveal ul li::before {
-	content: "•";
-	color: var(--r-list-bullet-color);
-	display: inline-block;
-	width: 1em;
-	margin-left: -1em
-}
-
-.reveal ol {
-	list-style: none;
-	counter-reset: li;
-}
-
-.reveal ol li::before {
-	content: counter(li) ".";
-	color: var(--r-list-bullet-color);
-	display: inline-block;
-	width: 2em;
-
-	margin-left: -2.5em;
-    margin-right: 0.5em;
-	text-align: right;
-}
-
-.reveal ol li {
-	counter-increment: li
-}
diff --git a/demo.html b/demo.html
@@ -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','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>
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/black.css'); return false;">Black (default)</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/white.css'); return false;">White</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/league.css'); return false;">League</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/sky.css'); return false;">Sky</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/beige.css'); return false;">Beige</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/simple.css'); return false;">Simple</a> <br>
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/serif.css'); return false;">Serif</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/blood.css'); return false;">Blood</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/night.css'); return false;">Night</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/moon.css'); return false;">Moon</a> -
+						<a href="#/themes" onclick="document.getElementById('theme').setAttribute('href','dist/theme/solarized.css'); return false;">Solarized</a>
 					</p>
 				</section>
 

diff --git a/dist/reveal.css b/dist/reveal.css
diff --git a/dist/reveal.esm.js b/dist/reveal.esm.js
diff --git a/dist/reveal.esm.js.map b/dist/reveal.esm.js.map
diff --git a/dist/reveal.js b/dist/reveal.js
diff --git a/dist/reveal.js.map b/dist/reveal.js.map
diff --git a/dist/theme/dracula.css b/dist/theme/dracula.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 /**
  * Dracula Dark theme for reveal.js.
  * Based on https://draculatheme.com
@@ -373,42 +372,12 @@ section.has-light-background, section.has-light-background h1, section.has-light
 .reveal strong, .reveal b {
   color: var(--r-bold-color);
 }
-
 .reveal em, .reveal i, .reveal blockquote {
   color: var(--r-italic-color);
 }
-
 .reveal code {
   color: var(--r-inline-code-color);
 }
-
-.reveal ul {
-  list-style: none;
-}
-
-.reveal ul li::before {
-  content: "•";
+.reveal ul li::marker, .reveal ol li::marker {
   color: var(--r-list-bullet-color);
-  display: inline-block;
-  width: 1em;
-  margin-left: -1em;
-}
-
-.reveal ol {
-  list-style: none;
-  counter-reset: li;
-}
-
-.reveal ol li::before {
-  content: counter(li) ".";
-  color: var(--r-list-bullet-color);
-  display: inline-block;
-  width: 2em;
-  margin-left: -2.5em;
-  margin-right: 0.5em;
-  text-align: right;
-}
-
-.reveal ol li {
-  counter-increment: li;
 }
diff --git a/js/reveal.js b/js/reveal.js
@@ -2705,6 +2705,10 @@ export default function( revealElement, options ) {
 		loadSlide: slideContent.load.bind( slideContent ),
 		unloadSlide: slideContent.unload.bind( slideContent ),
 
+		// Media playback
+		startEmbeddedContent: () => slideContent.startEmbeddedContent( currentSlide ),
+		stopEmbeddedContent: () => slideContent.stopEmbeddedContent( currentSlide, { unloadIframes: false } ),
+
 		// Preview management
 		showPreview,
 		hidePreview: closeOverlay,

diff --git a/plugin/markdown/markdown.esm.js b/plugin/markdown/markdown.esm.js