Skip to content

Commit

Permalink
Merge tag '5.0.2'
Browse files Browse the repository at this point in the history
 Conflicts:
	README.md
	gulpfile.js
	index.html
	package-lock.json
	package.json
  • Loading branch information
schnatterer committed Nov 16, 2023
2 parents 0ded871 + bddeb70 commit e8e7e5a
Show file tree
Hide file tree
Showing 92 changed files with 11,761 additions and 14,210 deletions.
33 changes: 20 additions & 13 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
name: tests

on: [push]
on:
- push

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 14.x, 16.x]
node-version:
- 18
- 20

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run build --if-present
- run: npm test
env:
CI: true
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- run: npm install
- run: npm run build --if-present
- run: npm test
env:
CI: true
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/test
/examples
.github
.gulpfile
.sass-cache
gulpfile.js
CONTRIBUTING.md
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2011-2022 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
Expand Down
2 changes: 1 addition & 1 deletion README-reveal-js.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Hakim's open source work is supported by <a href="https://github.com/sponsors/ha

---
<div align="center">
MIT licensed | Copyright © 2011-2022 Hakim El Hattab, https://hakim.se
MIT licensed | Copyright © 2011-2023 Hakim El Hattab, https://hakim.se
</div>
66 changes: 27 additions & 39 deletions css/print/paper.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Expand All @@ -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; }
Expand All @@ -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;
Expand All @@ -106,7 +94,7 @@

perspective-origin: 50% 50%;
}
.reveal .slides section {
.slides section {
visibility: visible !important;
position: static !important;
width: auto !important;
Expand All @@ -129,48 +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 .r-fit-text {
.r-fit-text {
white-space: normal !important;
}

.reveal section img {
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;
}
Expand Down
8 changes: 6 additions & 2 deletions css/print/pdf.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* https://revealjs.com/pdf-export/
*/

html.print-pdf {
html.reveal-print {
* {
-webkit-print-color-adjust: exact;
}
Expand Down Expand Up @@ -36,7 +36,6 @@ html.print-pdf {

.reveal pre code {
overflow: hidden !important;
font-family: Courier, 'Courier New', monospace !important;
}

.reveal {
Expand Down Expand Up @@ -71,6 +70,10 @@ html.print-pdf {
page-break-after: always;
}

.reveal .slides .pdf-page:last-of-type {
page-break-after: avoid;
}

.reveal .slides section {
visibility: visible !important;
display: block !important;
Expand Down Expand Up @@ -152,6 +155,7 @@ html.print-pdf {
display: block;
position: absolute;
font-size: 14px;
visibility: visible;
}

/* This accessibility tool is not useful in PDF and breaks it visually */
Expand Down
Loading

0 comments on commit e8e7e5a

Please sign in to comment.