diff options
author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2020-09-09 10:26:42 +0200 |
---|---|---|
committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2020-09-09 10:26:42 +0200 |
commit | 4d62dcc674290ccf3e842cd4516e06d7496d1e2d (patch) | |
tree | da0544b6cfcc0307ed0e69357725d181a9f19da5 | |
parent | faa8b56e2ae430b0ab4fd71610155e5316b06149 (diff) | |
parent | 17bfa625798687394497f908b399eacd2895222e (diff) | |
download | fosdem-2021-minimalism-presentation-4d62dcc674290ccf3e842cd4516e06d7496d1e2d.tar fosdem-2021-minimalism-presentation-4d62dcc674290ccf3e842cd4516e06d7496d1e2d.tar.gz |
Merge branch 'master' of github.com:hakimel/reveal.js into dev
-rw-r--r-- | css/print/pdf.scss | 2 | ||||
-rw-r--r-- | css/theme/README.md | 2 | ||||
-rw-r--r-- | css/theme/source/beige.scss | 4 | ||||
-rw-r--r-- | css/theme/source/black.scss | 4 | ||||
-rw-r--r-- | css/theme/source/league.scss | 4 | ||||
-rw-r--r-- | css/theme/source/moon.scss | 2 | ||||
-rw-r--r-- | css/theme/source/solarized.scss | 2 | ||||
-rw-r--r-- | css/theme/source/white.scss | 4 | ||||
-rw-r--r-- | dist/theme/beige.css | 2 | ||||
-rw-r--r-- | dist/theme/black.css | 2 | ||||
-rw-r--r-- | dist/theme/fonts/league-gothic/league-gothic.css | 10 | ||||
-rw-r--r-- | dist/theme/fonts/source-sans-pro/source-sans-pro.css | 34 | ||||
-rw-r--r-- | dist/theme/league.css | 2 | ||||
-rw-r--r-- | dist/theme/moon.css | 2 | ||||
-rw-r--r-- | dist/theme/solarized.css | 2 | ||||
-rw-r--r-- | dist/theme/white.css | 2 | ||||
-rw-r--r-- | js/controllers/autoanimate.js | 4 |
17 files changed, 42 insertions, 42 deletions
diff --git a/css/print/pdf.scss b/css/print/pdf.scss index ea0d417..f967845 100644 --- a/css/print/pdf.scss +++ b/css/print/pdf.scss @@ -2,7 +2,7 @@ * This stylesheet is used to print reveal.js * presentations to PDF. * - * https://revealjs.revealjs.com/pdf-export/ + * https://revealjs.com/pdf-export/ */ html.print-pdf { diff --git a/css/theme/README.md b/css/theme/README.md index 35b5dea..30916c4 100644 --- a/css/theme/README.md +++ b/css/theme/README.md @@ -1,6 +1,6 @@ ## Dependencies -Themes are written using Sass to keep things modular and reduce the need for repeated selectors across files. Make sure that you have the reveal.js development environment installed before proceeding: https://revealjs.revealjs.com/installation/#full-setup +Themes are written using Sass to keep things modular and reduce the need for repeated selectors across files. Make sure that you have the reveal.js development environment installed before proceeding: https://revealjs.com/installation/#full-setup ## Creating a Theme diff --git a/css/theme/source/beige.scss b/css/theme/source/beige.scss index d82c510..1f60178 100644 --- a/css/theme/source/beige.scss +++ b/css/theme/source/beige.scss @@ -13,7 +13,7 @@ // Include theme-specific fonts -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); @@ -38,4 +38,4 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b // Theme template ------------------------------ @import "../template/theme"; -// ---------------------------------------------
\ No newline at end of file +// --------------------------------------------- diff --git a/css/theme/source/black.scss b/css/theme/source/black.scss index ba72335..358dc1d 100644 --- a/css/theme/source/black.scss +++ b/css/theme/source/black.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(fonts/source-sans-pro/source-sans-pro.css); +@import url(./fonts/source-sans-pro/source-sans-pro.css); // Override theme settings (see ../template/settings.scss) @@ -43,4 +43,4 @@ $heading4Size: 1.0em; // Theme template ------------------------------ @import "../template/theme"; -// ---------------------------------------------
\ No newline at end of file +// --------------------------------------------- diff --git a/css/theme/source/league.scss b/css/theme/source/league.scss index 6b9697e..ee01258 100644 --- a/css/theme/source/league.scss +++ b/css/theme/source/league.scss @@ -15,7 +15,7 @@ // Include theme-specific fonts -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); // Override theme settings (see ../template/settings.scss) @@ -33,4 +33,4 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b // Theme template ------------------------------ @import "../template/theme"; -// ---------------------------------------------
\ No newline at end of file +// --------------------------------------------- diff --git a/css/theme/source/moon.scss b/css/theme/source/moon.scss index b398f4f..ff2074a 100644 --- a/css/theme/source/moon.scss +++ b/css/theme/source/moon.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** diff --git a/css/theme/source/solarized.scss b/css/theme/source/solarized.scss index df3a08f..8bdf1eb 100644 --- a/css/theme/source/solarized.scss +++ b/css/theme/source/solarized.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); diff --git a/css/theme/source/white.scss b/css/theme/source/white.scss index 20e8f7e..443d30a 100644 --- a/css/theme/source/white.scss +++ b/css/theme/source/white.scss @@ -12,7 +12,7 @@ // Include theme-specific fonts -@import url(fonts/source-sans-pro/source-sans-pro.css); +@import url(./fonts/source-sans-pro/source-sans-pro.css); // Override theme settings (see ../template/settings.scss) @@ -43,4 +43,4 @@ $heading4Size: 1.0em; // Theme template ------------------------------ @import "../template/theme"; -// ---------------------------------------------
\ No newline at end of file +// --------------------------------------------- diff --git a/dist/theme/beige.css b/dist/theme/beige.css index 7e7a7e6..4cdd397 100644 --- a/dist/theme/beige.css +++ b/dist/theme/beige.css @@ -3,7 +3,7 @@ * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { color: #fff; } diff --git a/dist/theme/black.css b/dist/theme/black.css index 6df4aa8..dcde9de 100644 --- a/dist/theme/black.css +++ b/dist/theme/black.css @@ -3,7 +3,7 @@ * * By Hakim El Hattab, http://hakim.se */ -@import url(fonts/source-sans-pro/source-sans-pro.css); +@import url(./fonts/source-sans-pro/source-sans-pro.css); section.has-light-background, section.has-light-background h1, section.has-light-background h2, section.has-light-background h3, section.has-light-background h4, section.has-light-background h5, section.has-light-background h6 { color: #222; } diff --git a/dist/theme/fonts/league-gothic/league-gothic.css b/dist/theme/fonts/league-gothic/league-gothic.css index 44a33a1..32862f8 100644 --- a/dist/theme/fonts/league-gothic/league-gothic.css +++ b/dist/theme/fonts/league-gothic/league-gothic.css @@ -1,10 +1,10 @@ @font-face { font-family: 'League Gothic'; - src: url('league-gothic.eot'); - src: url('league-gothic.eot?#iefix') format('embedded-opentype'), - url('league-gothic.woff') format('woff'), - url('league-gothic.ttf') format('truetype'); + src: url('./league-gothic.eot'); + src: url('./league-gothic.eot?#iefix') format('embedded-opentype'), + url('./league-gothic.woff') format('woff'), + url('./league-gothic.ttf') format('truetype'); font-weight: normal; font-style: normal; -}
\ No newline at end of file +} diff --git a/dist/theme/fonts/source-sans-pro/source-sans-pro.css b/dist/theme/fonts/source-sans-pro/source-sans-pro.css index 0707a4f..99e4fb7 100644 --- a/dist/theme/fonts/source-sans-pro/source-sans-pro.css +++ b/dist/theme/fonts/source-sans-pro/source-sans-pro.css @@ -1,39 +1,39 @@ @font-face { font-family: 'Source Sans Pro'; - src: url('source-sans-pro-regular.eot'); - src: url('source-sans-pro-regular.eot?#iefix') format('embedded-opentype'), - url('source-sans-pro-regular.woff') format('woff'), - url('source-sans-pro-regular.ttf') format('truetype'); + src: url('./source-sans-pro-regular.eot'); + src: url('./source-sans-pro-regular.eot?#iefix') format('embedded-opentype'), + url('./source-sans-pro-regular.woff') format('woff'), + url('./source-sans-pro-regular.ttf') format('truetype'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Source Sans Pro'; - src: url('source-sans-pro-italic.eot'); - src: url('source-sans-pro-italic.eot?#iefix') format('embedded-opentype'), - url('source-sans-pro-italic.woff') format('woff'), - url('source-sans-pro-italic.ttf') format('truetype'); + src: url('./source-sans-pro-italic.eot'); + src: url('./source-sans-pro-italic.eot?#iefix') format('embedded-opentype'), + url('./source-sans-pro-italic.woff') format('woff'), + url('./source-sans-pro-italic.ttf') format('truetype'); font-weight: normal; font-style: italic; } @font-face { font-family: 'Source Sans Pro'; - src: url('source-sans-pro-semibold.eot'); - src: url('source-sans-pro-semibold.eot?#iefix') format('embedded-opentype'), - url('source-sans-pro-semibold.woff') format('woff'), - url('source-sans-pro-semibold.ttf') format('truetype'); + src: url('./source-sans-pro-semibold.eot'); + src: url('./source-sans-pro-semibold.eot?#iefix') format('embedded-opentype'), + url('./source-sans-pro-semibold.woff') format('woff'), + url('./source-sans-pro-semibold.ttf') format('truetype'); font-weight: 600; font-style: normal; } @font-face { font-family: 'Source Sans Pro'; - src: url('source-sans-pro-semibolditalic.eot'); - src: url('source-sans-pro-semibolditalic.eot?#iefix') format('embedded-opentype'), - url('source-sans-pro-semibolditalic.woff') format('woff'), - url('source-sans-pro-semibolditalic.ttf') format('truetype'); + src: url('./source-sans-pro-semibolditalic.eot'); + src: url('./source-sans-pro-semibolditalic.eot?#iefix') format('embedded-opentype'), + url('./source-sans-pro-semibolditalic.woff') format('woff'), + url('./source-sans-pro-semibolditalic.ttf') format('truetype'); font-weight: 600; font-style: italic; -}
\ No newline at end of file +} diff --git a/dist/theme/league.css b/dist/theme/league.css index e255ca8..e21024b 100644 --- a/dist/theme/league.css +++ b/dist/theme/league.css @@ -5,7 +5,7 @@ * * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se */ -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); section.has-light-background, section.has-light-background h1, section.has-light-background h2, section.has-light-background h3, section.has-light-background h4, section.has-light-background h5, section.has-light-background h6 { color: #222; } diff --git a/dist/theme/moon.css b/dist/theme/moon.css index eff9c2d..3852595 100644 --- a/dist/theme/moon.css +++ b/dist/theme/moon.css @@ -2,7 +2,7 @@ * Solarized Dark theme for reveal.js. * Author: Achim Staebler */ -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized colors by Ethan Schoonover diff --git a/dist/theme/solarized.css b/dist/theme/solarized.css index f51cf94..a690537 100644 --- a/dist/theme/solarized.css +++ b/dist/theme/solarized.css @@ -2,7 +2,7 @@ * Solarized Light theme for reveal.js. * Author: Achim Staebler */ -@import url(fonts/league-gothic/league-gothic.css); +@import url(./fonts/league-gothic/league-gothic.css); @import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic); /** * Solarized colors by Ethan Schoonover diff --git a/dist/theme/white.css b/dist/theme/white.css index be28700..e9b1ead 100644 --- a/dist/theme/white.css +++ b/dist/theme/white.css @@ -3,7 +3,7 @@ * * By Hakim El Hattab, http://hakim.se */ -@import url(fonts/source-sans-pro/source-sans-pro.css); +@import url(./fonts/source-sans-pro/source-sans-pro.css); section.has-dark-background, section.has-dark-background h1, section.has-dark-background h2, section.has-dark-background h3, section.has-dark-background h4, section.has-dark-background h5, section.has-dark-background h6 { color: #fff; } diff --git a/js/controllers/autoanimate.js b/js/controllers/autoanimate.js index 22f7e7c..ff74eee 100644 --- a/js/controllers/autoanimate.js +++ b/js/controllers/autoanimate.js @@ -461,7 +461,7 @@ export default class AutoAnimate { pairs.forEach( pair => { - // Disable scale transformations on text nodes, we transiition + // Disable scale transformations on text nodes, we transition // each individual text property instead if( matches( pair.from, textNodes ) ) { pair.options = { scale: false }; @@ -616,4 +616,4 @@ export default class AutoAnimate { } -}
\ No newline at end of file +} |