Skip to content

Commit 6292f76

Browse files
fix: resolve merge conflicts
2 parents 3c33ae2 + eb95b14 commit 6292f76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+975
-494
lines changed

.codespellrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[codespell]
2+
# Ref: https://github.com/codespell-project/codespell#using-a-config-file
3+
skip = .git*,package-lock.json,*.css,.codespellrc
4+
check-hidden = true
5+
# Ignore super long lines -- must be minimized etc, acronyms
6+
# and some near hit variables
7+
ignore-regex = ^.{120,}|\b(currentY|FOM)\b
8+
# ignore-words-list =

.github/workflows/spellcheck.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Codespell configuration is within .codespellrc
2+
---
3+
name: Spellcheck
4+
5+
on:
6+
push:
7+
branches: [master]
8+
pull_request:
9+
branches: [master]
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
codespell:
16+
name: Check for spelling errors
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
- name: Codespell
23+
uses: codespell-project/actions-codespell@v2

.github/workflows/js.yml renamed to .github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: tests
1+
name: Tests
22

33
on:
44
- push

css/reveal.scss

Lines changed: 224 additions & 147 deletions
Large diffs are not rendered by default.

css/theme/source/dracula.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
@import "../template/settings";
1010
// ---------------------------------------------
1111

12-
13-
1412
// Include theme-specific fonts
13+
@import url(./fonts/league-gothic/league-gothic.css);
14+
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
15+
1516
$systemFontsSansSerif: -apple-system,
1617
BlinkMacSystemFont,
1718
avenir next,

css/theme/template/exposer.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Exposes theme's variables for easy re-use in CSS for plugin authors
1+
// Exposes theme's variables for easy reuse in CSS for plugin authors
22

33
@use "sass:color";
44

demo.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,25 @@ <h2>Touch Optimized</h2>
197197
</script>
198198
</section>
199199

200+
<section>
201+
<h2>Lightbox</h2>
202+
Turn any element into a <a href="https://revealjs.com/lightbox/">lightbox</a> using <strong>data‑preview‑image</strong> & <strong>data‑preview‑video</strong>.
203+
<div class="r-hstack" style="gap: 2rem;">
204+
<div>
205+
<pre style="font-size: 12px; width: 100%"><code class="html" data-trim>
206+
&lt;img src="image.png" data-preview-image="image.png"&gt;
207+
</code></pre>
208+
<img src="https://static.slid.es/logo/v2/slides-symbol-1024x1024.png" height="100" data-preview-image>
209+
</div>
210+
<div>
211+
<pre style="font-size: 12px; width: 100%"><code class="html" data-trim>
212+
&lt;img src="video.png" data-preview-video="video.mp4"&gt;
213+
</code></pre>
214+
<img src="https://static.slid.es/site/homepage/v1/homepage-video-editor.png" height="100" data-preview-video="https://static.slid.es/site/homepage/v1/homepage-video-editor.mp4">
215+
</div>
216+
</div>
217+
</section>
218+
200219
<section>
201220
<p>Add the <code>r-fit-text</code> class to auto-size text</p>
202221
<h2 class="r-fit-text">FIT TEXT</h2>

dist/reveal.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/reveal.esm.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/reveal.esm.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)