Commit b24d7eeb authored by Davide Depau's avatar Davide Depau
Browse files

Merge remote-tracking branch 'tpl/master' into revealjs

parents 9f30bd49 2b7abf5f
Pipeline #643 passed with stage
in 59 seconds
...@@ -42,6 +42,14 @@ You can add `--depth 1` to the previous commands to improve the update speed but ...@@ -42,6 +42,14 @@ You can add `--depth 1` to the previous commands to improve the update speed but
1. Add author's info in `./slides/intro.html` and `./slides/outro.html` 1. Add author's info in `./slides/intro.html` and `./slides/outro.html`
1. Put your content in `./slides/content.md` or add slides files in `./slides/` and link these in `./index.html` 1. Put your content in `./slides/content.md` or add slides files in `./slides/` and link these in `./index.html`
All user-supplied content MUST be placed under the `slides` directory.
This allows to easily merge changes from this template without breaking the
slides.
If you're updating old slides you should resolve all the conflicts yourself and
migrate to the new layout described here.
### How do I write my stuff? ### How do I write my stuff?
Using Vim. Using Vim.
......
...@@ -15,16 +15,19 @@ ...@@ -15,16 +15,19 @@
<!-- POuL theme for reveal.js --> <!-- POuL theme for reveal.js -->
<link href="./poul/css/poul.css" id="theme" rel="stylesheet"/> <link href="./poul/css/poul.css" id="theme" rel="stylesheet"/>
<!-- print-button plugin style -->
<link href="./reveal.js/plugin/print-button/style.css" rel="stylesheet"/>
<!-- Code syntax highlighting --> <!-- Code syntax highlighting -->
<link href="./reveal.js/lib/css_highlight/hopscotch.css" rel="stylesheet"/> <link href="./reveal.js/lib/css_highlight/hopscotch.css" rel="stylesheet"/>
<!-- Printing and PDF exports --> <!-- Printing and PDF exports -->
<script> <script>
let link = document.createElement('link'); let link = document.createElement('link');
link.rel = 'stylesheet'; link.rel = 'stylesheet';
link.href = window.location.search.match(/print-pdf/gi) link.href = window.location.search.match(/print-pdf/gi)
? './poul/css/print/pdf.css' : './poul/css/print/paper.css'; ? './poul/css/print/pdf.css' : './poul/css/print/paper.css';
document.getElementsByTagName('head')[0].appendChild(link); document.getElementsByTagName('head')[0].appendChild(link);
</script> </script>
<script src="./reveal.js/lib/js/head.min.js"></script> <script src="./reveal.js/lib/js/head.min.js"></script>
...@@ -32,63 +35,66 @@ ...@@ -32,63 +35,66 @@
<!-- Init Reveal.js --> <!-- Init Reveal.js -->
<script> <script>
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
Reveal.initialize({ Reveal.initialize({
controls: false, controls: false,
slideNumber: true, slideNumber: true,
history: true, history: true,
transition: 'none', transition: 'none',
pdfMaxPagesPerSlide: 1, pdfMaxPagesPerSlide: 1,
pdfSeparateFragments: false, pdfSeparateFragments: false,
display: 'flex', display: 'flex',
markdown: { markdown: {
smartypants: true, smartypants: true,
}, },
keyboard: { keyboard: {
38: 'prev', // Up arrow 38: 'prev', // Up arrow
40: 'next' // Down arrow 40: 'next' // Down arrow
}, },
math: { math: {
mathjax: './reveal.js/lib/js/mathjax/MathJax.js', mathjax: './reveal.js/lib/js/mathjax/MathJax.js',
config: 'TeX-AMS_HTML-full' // See http://docs.mathjax.org/en/latest/config-files.html config: 'TeX-AMS_HTML-full' // See http://docs.mathjax.org/en/latest/config-files.html
}, },
dependencies: [ dependencies: [
{ {
src: './reveal.js/plugin/external/external.js', src: './reveal.js/plugin/external/external.js',
condition: function () { condition: function () {
return !!document.querySelector('[data-external],[data-external-replace]'); return !!document.querySelector('[data-external],[data-external-replace]');
} }
}, },
{ {
src: './reveal.js/plugin/markdown/marked.js', src: './reveal.js/plugin/markdown/marked.js',
condition: function () { condition: function () {
return !!document.querySelector('[data-markdown]'); return !!document.querySelector('[data-markdown]');
} }
}, },
{ {
src: './reveal.js/plugin/markdown/markdown.js', src: './reveal.js/plugin/markdown/markdown.js',
condition: function () { condition: function () {
return !!document.querySelector('[data-markdown]'); return !!document.querySelector('[data-markdown]');
} }
}, },
{ {
src: './reveal.js/plugin/highlight/highlight.js', src: './reveal.js/plugin/highlight/highlight.js',
async: true, async: true,
callback: function () { callback: function () {
hljs.initHighlightingOnLoad(); hljs.initHighlightingOnLoad();
} }
}, },
{ {
src: './reveal.js/plugin/notes/notes.js', src: './reveal.js/plugin/notes/notes.js',
async: true async: true
}, },
{ {
src: './reveal.js/plugin/math/math.js', src: './reveal.js/plugin/math/math.js',
async: true async: true
} },
] {
}); src: './reveal.js/plugin/print-button/print-button.js'
}); }
]
});
});
</script> </script>
</head> </head>
...@@ -96,13 +102,11 @@ ...@@ -96,13 +102,11 @@
<div class="slides"> <div class="slides">
<section data-external-replace="./slides/intro.html"></section> <section data-external-replace="./slides/intro.html"></section>
<section data-charset="utf-8" <section data-charset="utf-8"
data-markdown="./slides/content.md" data-markdown="./slides/content.md"
data-separator="^\r?\n---\r?\n$" data-separator="^\r?\n---\r?\n$"
data-separator-notes="^Notes:" data-separator-notes="^Notes:"
data-separator-vertical="^\r?\n----\r?\n$"> data-separator-vertical="^\r?\n----\r?\n$">
</section> </section>
<section data-external-replace="./slides/outro.html"></section> <section data-external-replace="./slides/outro.html"></section>
</div> </div>
</div> </div>
\ No newline at end of file
<a class="printable-version" href="?print-pdf" title="Versione Stampabile"></a>
...@@ -299,13 +299,12 @@ body { ...@@ -299,13 +299,12 @@ body {
/********************************************* /*********************************************
* IMAGES * IMAGES
*********************************************/ *********************************************/
.reveal section img { .reveal img {
max-width: 67%; max-width: 67%;
padding: 4%; margin: 2%;
} }
.reveal img.plain {
.reveal section img.plain {
border: 0; border: 0;
box-shadow: none; box-shadow: none;
} }
...@@ -322,6 +321,10 @@ body { ...@@ -322,6 +321,10 @@ body {
box-shadow: 0 0 20px rgba(0, 0, 0, 0.55); box-shadow: 0 0 20px rgba(0, 0, 0, 0.55);
} }
.reveal img.shadow {
box-shadow: 5px 5px 8px #000;
}
/********************************************* /*********************************************
* NAVIGATION CONTROLS * NAVIGATION CONTROLS
*********************************************/ *********************************************/
...@@ -394,32 +397,17 @@ body { ...@@ -394,32 +397,17 @@ body {
/********************************************* /*********************************************
* CODE * CODE
*********************************************/ *********************************************/
code.input::before, pre.input > code::before { .reveal code {
tab-size: 4;
-moz-tab-size: 4;
}
.reveal code.input::before, .reveal pre.input > code::before {
content: "$"; content: "$";
color: #8699A4; color: #8699A4;
padding-right: 5px; padding-right: 5px;
} }
code.input.root::before, pre.input.root > code::before { .reveal code.input.root::before, .reveal pre.input.root > code::before {
content: "#"; content: "#";
}
/*********************************************
* OTHER
*********************************************/
.printable-version {
position: absolute;
bottom: 3vh;
left: 3vh;
height: 30px;
width: 30px;
display: block;
z-index: 100;
opacity: 0.2;
transition: opacity 0.3s;
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 52 52' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23A2A2A2'%3E%3Cpath d='M11.96 50h28.09V32H11.96v18zm6.854-13.003h14.189v2H18.814v-2zm0 6h14.189v2H18.814v-2zM16 20h20v-.003h1.003v-2H36V2H16v15.997h-.997v2H16z'/%3E%3Cpath d='M43.03 10H38v5.997h1.003v6H38V22H14v-.003h-.997v-6H14V10H8.97C5.13 10 2 13.12 2 16.97V40h7.96V30h32.09v10H50V16.97A6.97 6.97 0 0043.03 10z'/%3E%3C/g%3E%3C/svg%3E");
}
.printable-version:hover {
opacity: 1;
} }
\ No newline at end of file
Subproject commit 9fb68a1713a5c0fb62ba0e2d3bca1ec9b3573de6 Subproject commit bd3659dd8b2345b3a7f7a6c4d080589641959dba
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment