aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2016-06-10 10:58:40 +0200
committerHakim El Hattab <hakim.elhattab@gmail.com>2016-06-10 10:58:40 +0200
commit8162855d23601e66a25ba79dd4013ef416c4f1b4 (patch)
treecfcdd3391293b9ef1c15e54e8d367139c4a9ceb5
parent6bfa48a667fe91bb1de1b680769aeb7260af3a49 (diff)
downloadfosdem-2018-presentation-8162855d23601e66a25ba79dd4013ef416c4f1b4.tar
fosdem-2018-presentation-8162855d23601e66a25ba79dd4013ef416c4f1b4.tar.gz
increase default font sizes, adjust config defaults for less margings and larger max scale #1605
-rw-r--r--css/theme/beige.css2
-rw-r--r--css/theme/black.css2
-rw-r--r--css/theme/blood.css2
-rw-r--r--css/theme/league.css2
-rw-r--r--css/theme/moon.css2
-rw-r--r--css/theme/night.css2
-rw-r--r--css/theme/serif.css2
-rw-r--r--css/theme/simple.css2
-rw-r--r--css/theme/sky.css2
-rw-r--r--css/theme/solarized.css2
-rw-r--r--css/theme/source/black.scss2
-rw-r--r--css/theme/source/blood.scss1
-rw-r--r--css/theme/source/night.scss1
-rw-r--r--css/theme/source/white.scss2
-rw-r--r--css/theme/template/settings.scss2
-rw-r--r--css/theme/white.css2
-rw-r--r--demo.html2
-rw-r--r--js/reveal.js4
18 files changed, 18 insertions, 18 deletions
diff --git a/css/theme/beige.css b/css/theme/beige.css
index 7f71dd9..7424a05 100644
--- a/css/theme/beige.css
+++ b/css/theme/beige.css
@@ -20,7 +20,7 @@ body {
.reveal {
font-family: "Lato", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #333; }
diff --git a/css/theme/black.css b/css/theme/black.css
index 9228c46..96e4fd4 100644
--- a/css/theme/black.css
+++ b/css/theme/black.css
@@ -16,7 +16,7 @@ body {
.reveal {
font-family: "Source Sans Pro", Helvetica, sans-serif;
- font-size: 38px;
+ font-size: 42px;
font-weight: normal;
color: #fff; }
diff --git a/css/theme/blood.css b/css/theme/blood.css
index 2da8d68..1e0fbaf 100644
--- a/css/theme/blood.css
+++ b/css/theme/blood.css
@@ -19,7 +19,7 @@ body {
.reveal {
font-family: Ubuntu, "sans-serif";
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #eee; }
diff --git a/css/theme/league.css b/css/theme/league.css
index aa5bee5..63711c3 100644
--- a/css/theme/league.css
+++ b/css/theme/league.css
@@ -22,7 +22,7 @@ body {
.reveal {
font-family: "Lato", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #eee; }
diff --git a/css/theme/moon.css b/css/theme/moon.css
index 5cb1176..791a4a0 100644
--- a/css/theme/moon.css
+++ b/css/theme/moon.css
@@ -20,7 +20,7 @@ body {
.reveal {
font-family: "Lato", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #93a1a1; }
diff --git a/css/theme/night.css b/css/theme/night.css
index cf2c7a7..3db1175 100644
--- a/css/theme/night.css
+++ b/css/theme/night.css
@@ -14,7 +14,7 @@ body {
.reveal {
font-family: "Open Sans", sans-serif;
- font-size: 30px;
+ font-size: 40px;
font-weight: normal;
color: #eee; }
diff --git a/css/theme/serif.css b/css/theme/serif.css
index bbb9f7e..e9b08c6 100644
--- a/css/theme/serif.css
+++ b/css/theme/serif.css
@@ -16,7 +16,7 @@ body {
.reveal {
font-family: "Palatino Linotype", "Book Antiqua", Palatino, FreeSerif, serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #000; }
diff --git a/css/theme/simple.css b/css/theme/simple.css
index cb840d9..f64343e 100644
--- a/css/theme/simple.css
+++ b/css/theme/simple.css
@@ -19,7 +19,7 @@ body {
.reveal {
font-family: "Lato", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #000; }
diff --git a/css/theme/sky.css b/css/theme/sky.css
index 202ade8..33689eb 100644
--- a/css/theme/sky.css
+++ b/css/theme/sky.css
@@ -23,7 +23,7 @@ body {
.reveal {
font-family: "Open Sans", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #333; }
diff --git a/css/theme/solarized.css b/css/theme/solarized.css
index 44771dc..9bd21aa 100644
--- a/css/theme/solarized.css
+++ b/css/theme/solarized.css
@@ -20,7 +20,7 @@ body {
.reveal {
font-family: "Lato", sans-serif;
- font-size: 36px;
+ font-size: 40px;
font-weight: normal;
color: #657b83; }
diff --git a/css/theme/source/black.scss b/css/theme/source/black.scss
index 5f7f601..84e8d9a 100644
--- a/css/theme/source/black.scss
+++ b/css/theme/source/black.scss
@@ -21,7 +21,7 @@ $backgroundColor: #222;
$mainColor: #fff;
$headingColor: #fff;
-$mainFontSize: 38px;
+$mainFontSize: 42px;
$mainFont: 'Source Sans Pro', Helvetica, sans-serif;
$headingFont: 'Source Sans Pro', Helvetica, sans-serif;
$headingTextShadow: none;
diff --git a/css/theme/source/blood.scss b/css/theme/source/blood.scss
index d22b53d..4533fc0 100644
--- a/css/theme/source/blood.scss
+++ b/css/theme/source/blood.scss
@@ -28,7 +28,6 @@ $backgroundColor: $coal;
// Main text
$mainFont: Ubuntu, 'sans-serif';
-$mainFontSize: 36px;
$mainColor: #eee;
// Headings
diff --git a/css/theme/source/night.scss b/css/theme/source/night.scss
index b0cb57f..d49a282 100644
--- a/css/theme/source/night.scss
+++ b/css/theme/source/night.scss
@@ -27,7 +27,6 @@ $headingTextShadow: none;
$headingLetterSpacing: -0.03em;
$headingTextTransform: none;
$selectionBackgroundColor: #e7ad52;
-$mainFontSize: 30px;
// Theme template ------------------------------
diff --git a/css/theme/source/white.scss b/css/theme/source/white.scss
index 6758ce0..7f06ffd 100644
--- a/css/theme/source/white.scss
+++ b/css/theme/source/white.scss
@@ -21,7 +21,7 @@ $backgroundColor: #fff;
$mainColor: #222;
$headingColor: #222;
-$mainFontSize: 38px;
+$mainFontSize: 42px;
$mainFont: 'Source Sans Pro', Helvetica, sans-serif;
$headingFont: 'Source Sans Pro', Helvetica, sans-serif;
$headingTextShadow: none;
diff --git a/css/theme/template/settings.scss b/css/theme/template/settings.scss
index ffaac23..63c02cf 100644
--- a/css/theme/template/settings.scss
+++ b/css/theme/template/settings.scss
@@ -6,7 +6,7 @@ $backgroundColor: #2b2b2b;
// Primary/body text
$mainFont: 'Lato', sans-serif;
-$mainFontSize: 36px;
+$mainFontSize: 40px;
$mainColor: #eee;
// Vertical spacing between blocks of text
diff --git a/css/theme/white.css b/css/theme/white.css
index 16a1d23..7adc605 100644
--- a/css/theme/white.css
+++ b/css/theme/white.css
@@ -16,7 +16,7 @@ body {
.reveal {
font-family: "Source Sans Pro", Helvetica, sans-serif;
- font-size: 38px;
+ font-size: 42px;
font-weight: normal;
color: #222; }
diff --git a/demo.html b/demo.html
index 36ad224..632e8d6 100644
--- a/demo.html
+++ b/demo.html
@@ -391,6 +391,8 @@ Reveal.addEventListener( 'customevent', function() {
history: true,
center: true,
+ width: 1000,
+
transition: 'slide', // none/fade/slide/convex/concave/zoom
// More info https://github.com/hakimel/reveal.js#dependencies
diff --git a/js/reveal.js b/js/reveal.js
index 3de52c5..4999bdb 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -43,11 +43,11 @@
height: 700,
// Factor of the display size that should remain empty around the content
- margin: 0.1,
+ margin: 0.04,
// Bounds for smallest/largest possible scale to apply to content
minScale: 0.2,
- maxScale: 1.5,
+ maxScale: 2.0,
// Display controls in the bottom right corner
controls: true,