Merge remote-tracking branch 'upstream/master'

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -1,22 +1,20 @@
 ## Contributing
+Please keep the [issue tracker](https://github.com/hakimel/reveal.js/issues) limited to **bug reports**.
 
-Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limited to **bug reports**, **feature requests** and **pull requests**.
 
-
-### Personal Support
-If you have personal support or setup questions the best place to ask those are [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js).
+### General Questions and Support
+If you have questions about how to use reveal.js the best place to ask is in the [Discussions](https://github.com/hakimel/reveal.js/discussions). Anything that isn't a bug report should be posted as a dicussion instead.
 
 
 ### Bug Reports
 When reporting a bug make sure to include information about which browser and operating system you are on as well as the necessary steps to reproduce the issue. If possible please include a link to a sample presentation where the bug can be tested.
 
 
 ### Pull Requests
+- Should be submitted from a feature/topic branch (not your master)
 - Should follow the coding style of the file you work in, most importantly:
   - Tabs to indent
   - Single-quoted strings
-- Should be made towards the **dev branch**
-- Should be submitted from a feature/topic branch (not your master)
 
 
 ### Plugins

.github/workflows/js.yml

@@ -2,14 +2,17 @@ name: tests
 
 on: [push]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [10.x, 14.x]
+        node-version: [14.x]
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -8,5 +8,4 @@ out/
 log/*.log
 tmp/**
 node_modules/
-.sass-cache
-dist/*.map
+.sass-cache

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2020 Hakim El Hattab, http://hakim.se, and reveal.js contributors
+Copyright (C) 2011-2023 Hakim El Hattab, http://hakim.se, and reveal.js contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,15 +1,15 @@
 <p align="center">
   <a href="https://revealjs.com">
-  <img src="https://hakim-static.s3.amazonaws.com/reveal-js/logo/v1/reveal-black-text.svg" alt="reveal.js" width="450">
+  <img src="https://hakim-static.s3.amazonaws.com/reveal-js/logo/v1/reveal-black-text-sticker.png" alt="reveal.js" width="500">
   </a>
   <br><br>
   <a href="https://github.com/hakimel/reveal.js/actions"><img src="https://github.com/hakimel/reveal.js/workflows/tests/badge.svg"></a>
   <a href="https://slides.com/"><img src="https://s3.amazonaws.com/static.slid.es/images/slides-github-banner-320x40.png?1" alt="Slides" width="160" height="20"></a>
 </p>
 
-reveal.js is an open source HTML presentation framework. It enables anyone with a web browser to create fully featured and beautiful presentations for free. [Check out the live demo](https://revealjs.com/).
+reveal.js is an open source HTML presentation framework. It enables anyone with a web browser to create beautiful presentations for free. Check out the live demo at [revealjs.com](https://revealjs.com/).
 
-The framework comes with a broad range of features including [nested slides](https://revealjs.com/vertical-slides/), [Markdown support](https://revealjs.com/markdown/), [Auto-Animate](https://revealjs.com/auto-animate/), [PDF export](https://revealjs.com/pdf-export/), [speaker notes](https://revealjs.com/speaker-view/), [LaTeX support](https://revealjs.com/math/), [syntax highlighted code](https://revealjs.com/code/) and much more.
+The framework comes with a powerful feature set including [nested slides](https://revealjs.com/vertical-slides/), [Markdown support](https://revealjs.com/markdown/), [Auto-Animate](https://revealjs.com/auto-animate/), [PDF export](https://revealjs.com/pdf-export/), [speaker notes](https://revealjs.com/speaker-view/), [LaTeX typesetting](https://revealjs.com/math/), [syntax highlighted code](https://revealjs.com/code/) and an [extensive API](https://revealjs.com/api/).
 
 # [Get Started](https://revealjs.com/installation)
 
@@ -80,16 +80,41 @@ After (dynamically rendered code):
 
 # Reveal.js
 
-## Documentation
-The full reveal.js documentation is available at [revealjs.com](https://revealjs.com).
+Want to create reveal.js presentation in a graphical editor? Try <https://slides.com>. It's made by the same people behind reveal.js.
 
 ## Upgrading from previous versions
 Note that there are breaking changes relative to previous versions. See the [Upgrade instructions](https://revealjs.com/upgrading/) for more details.
 
-## License
+### Sponsors
+Hakim's open source work is supported by <a href="https://github.com/sponsors/hakimel">GitHub sponsors</a>. Special thanks to:
+<div align="center">
+  <table>
+    <td align="center">
+      <a href="https://workos.com/?utm_campaign=github_repo&utm_medium=referral&utm_content=revealjs&utm_source=github">
+        <div>
+          <img src="https://user-images.githubusercontent.com/629429/151508669-efb4c3b3-8fe3-45eb-8e47-e9510b5f0af1.svg" width="290" alt="WorkOS">
+        </div>
+        <b>Your app, enterprise-ready.</b>
+        <div>
+          <sub>Start selling to enterprise customers with just a few lines of code. Add Single Sign-On (and more) in minutes instead of months.</sup>
+        </div>
+      </a>
+    </td>
+  </table>
+</div>
+
+---
+
+### Getting started
+- 🚀 [Install reveal.js](https://revealjs.com/installation)
+- 👀 [View the demo presentation](https://revealjs.com/demo)
+- 📖 [Read the documentation](https://revealjs.com/markup/)
+- 🖌 [Try the visual editor for reveal.js at Slides.com](https://slides.com/)
+- 🎬 [Watch the reveal.js video course (paid)](https://revealjs.com/course)
+
+--- 
+<div align="center">
+  MIT licensed | Copyright © 2011-2023 Hakim El Hattab, https://hakim.se
+  BBC specific material is Copyright (C) 2020 BBC
+</div>
 
-MIT licensed
-
-Copyright (C) 2011-2020 Hakim El Hattab, https://hakim.se
-
-BBC specific material is Copyright (C) 2020 BBC

css/layout.scss

@@ -16,7 +16,7 @@
 	box-sizing: border-box;
 }
 
-// Text that auto-fits it's container
+// Text that auto-fits its container
 .reveal .r-fit-text {
 	display: inline-block; // https://github.com/rikschennink/fitty#performance
 	white-space: nowrap;

css/print/paper.scss

@@ -1,42 +1,30 @@
-/* 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. */
 
 @media print {
 	html:not(.print-pdf) {
-
-		background: #fff;
+		overflow: visible;
 		width: auto;
 		height: auto;
-		overflow: visible;
 
 		body {
-			background: #fff;
-			font-size: 20pt;
-			width: auto;
-			height: auto;
-			border: 0;
-			margin: 0 5%;
+			margin: 0;
 			padding: 0;
 			overflow: visible;
-			float: none !important;
 		}
+	}
+
+	html:not(.print-pdf) .reveal {
+		background: #fff;
+		font-size: 20pt;
 
-		.nestedarrow,
 		.controls,
-		.fork-reveal,
-		.share-reveal,
 		.state-background,
-		.reveal .progress,
-		.reveal .backgrounds,
-		.reveal .slide-number {
+		.progress,
+		.backgrounds,
+		.slide-number {
 			display: none !important;
 		}
 
-		body, p, td, li {
+		p, td, li {
 			font-size: 20pt!important;
 			color: #000;
 		}
@@ -49,7 +37,6 @@
 			letter-spacing: normal;
 		}
 
-		/* Need to reduce the size of the fonts for printing */
 		h1 { font-size: 28pt !important; }
 		h2 { font-size: 24pt !important; }
 		h3 { font-size: 22pt !important; }
@@ -74,18 +61,19 @@
 			margin: 0;
 			text-align: left !important;
 		}
-		.reveal pre,
-		.reveal table {
+		pre,
+		table {
 			margin-left: 0;
 			margin-right: 0;
 		}
-		.reveal pre code {
+		pre code {
 			padding: 20px;
 		}
-		.reveal blockquote {
+		blockquote {
 			margin: 20px 0;
 		}
-		.reveal .slides {
+
+		.slides {
 			position: static !important;
 			width: auto !important;
 			height: auto !important;
@@ -106,7 +94,7 @@
 
 			perspective-origin: 50% 50%;
 		}
-		.reveal .slides section {
+		.slides section {
 			visibility: visible !important;
 			position: static !important;
 			width: auto !important;
@@ -129,43 +117,48 @@
 			transform: none !important;
 			transition: none !important;
 		}
-		.reveal .slides section.stack {
+		.slides section.stack {
 			padding: 0 !important;
 		}
-		.reveal section:last-of-type {
+		.slides section:last-of-type {
 			page-break-after: avoid !important;
 		}
-		.reveal section .fragment {
+		.slides section .fragment {
 			opacity: 1 !important;
 			visibility: visible !important;
 
 			transform: none !important;
 		}
-		.reveal section img {
+
+		.r-fit-text {
+			white-space: normal !important;
+		}
+
+		section img {
 			display: block;
 			margin: 15px 0px;
 			background: rgba(255,255,255,1);
 			border: 1px solid #666;
 			box-shadow: none;
 		}
 
-		.reveal section small {
+		section small {
 			font-size: 0.8em;
 		}
 
-		.reveal .hljs {
+		.hljs {
 			max-height: 100%;
 			white-space: pre-wrap;
 			word-wrap: break-word;
 			word-break: break-word;
 			font-size: 15pt;
 		}
 
-		.reveal .hljs .hljs-ln-numbers {
+		.hljs .hljs-ln-numbers {
 			white-space: nowrap;
 		}
 
-		.reveal .hljs td {
+		.hljs td {
 			font-size: inherit !important;
 			color: inherit !important;
 		}

css/print/pdf.scss

@@ -100,7 +100,6 @@ html.print-pdf {
 		box-shadow: none;
 	}
 
-
 	/* Slide backgrounds are placed inside of their slide when exporting to PDF */
 	.reveal .backgrounds {
 		display: none;