From 7dbf519104deb87857896a469656f026e5b6e2af Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 21 Aug 2018 09:27:55 +0200 Subject: fix css conflict --- css/reveal.css | 48 ++++++++++++++++++++++++------------------------ css/reveal.scss | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 48 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index eda311e..f4f8b88 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1294,9 +1294,9 @@ body { transition-duration: 1200ms; } /********************************************* - * LINK PREVIEW OVERLAY + * OVERLAY FOR LINK PREVIEWS AND HELP *********************************************/ -.reveal .overlay { +.reveal > .overlay { position: absolute; top: 0; left: 0; @@ -1308,11 +1308,11 @@ body { visibility: hidden; transition: all 0.3s ease; } -.reveal .overlay.visible { +.reveal > .overlay.visible { opacity: 1; visibility: visible; } -.reveal .overlay .spinner { +.reveal > .overlay .spinner { position: absolute; display: block; top: 50%; @@ -1326,7 +1326,7 @@ body { opacity: 0.6; transition: all 0.3s ease; } -.reveal .overlay header { +.reveal > .overlay header { position: absolute; left: 0; top: 0; @@ -1335,7 +1335,7 @@ body { z-index: 2; border-bottom: 1px solid #222; } -.reveal .overlay header a { +.reveal > .overlay header a { display: inline-block; width: 40px; height: 40px; @@ -1345,10 +1345,10 @@ body { opacity: 0.6; box-sizing: border-box; } -.reveal .overlay header a:hover { +.reveal > .overlay header a:hover { opacity: 1; } -.reveal .overlay header a .icon { +.reveal > .overlay header a .icon { display: inline-block; width: 20px; height: 20px; @@ -1356,13 +1356,13 @@ body { background-size: 100%; background-repeat: no-repeat; } -.reveal .overlay header a.close .icon { +.reveal > .overlay header a.close .icon { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABkklEQVRYR8WX4VHDMAxG6wnoJrABZQPYBCaBTWAD2g1gE5gg6OOsXuxIlr40d81dfrSJ9V4c2VLK7spHuTJ/5wpM07QXuXc5X0opX2tEJcadjHuV80li/FgxTIEK/5QBCICBD6xEhSMGHgQPgBgLiYVAB1dpSqKDawxTohFw4JSEA3clzgIBPCURwE2JucBR7rhPJJv5OpJwDX+SfDjgx1wACQeJG1aChP9K/IMmdZ8DtESV1WyP3Bt4MwM6sj4NMxMYiqUWHQu4KYA/SYkIjOsm3BXYWMKFDwU2khjCQ4ELJUJ4SmClRArOCmSXGuKma0fYD5CbzHxFpCSGAhfAVSSUGDUk2BWZaff2g6GE15BsBQ9nwmpIGDiyHQddwNTMKkbZaf9fajXQca1EX44puJZUsnY0ObGmITE3GVLCbEhQUjGVt146j6oasWN+49Vph2w1pZ5EansNZqKBm1txbU57iRRcZ86RWMDdWtBJUHBHwoQPi1GV+JCbntmvok7iTX4/Up9mgyTc/FJYDTcndgH/AA5A/CHsyEkVAAAAAElFTkSuQmCC); } -.reveal .overlay header a.external .icon { +.reveal > .overlay header a.external .icon { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAcElEQVRYR+2WSQoAIQwEzf8f7XiOMkUQxUPlGkM3hVmiQfQR9GYnH1SsAQlI4DiBqkCMoNb9y2e90IAEJPAcgdznU9+engMaeJ7Azh5Y1U67gAho4DqBqmB1buAf0MB1AlVBek83ZPkmJMGc1wAR+AAqod/B97TRpQAAAABJRU5ErkJggg==); } -.reveal .overlay .viewport { +.reveal > .overlay .viewport { position: absolute; display: -webkit-box; display: -ms-flexbox; @@ -1372,7 +1372,7 @@ body { bottom: 0; left: 0; } -.reveal .overlay.overlay-preview .viewport iframe { +.reveal > .overlay.overlay-preview .viewport iframe { width: 100%; height: 100%; max-width: 100%; @@ -1382,11 +1382,11 @@ body { visibility: hidden; transition: all 0.3s ease; } -.reveal .overlay.overlay-preview.loaded .viewport iframe { +.reveal > .overlay.overlay-preview.loaded .viewport iframe { opacity: 1; visibility: visible; } -.reveal .overlay.overlay-preview.loaded .viewport-inner { +.reveal > .overlay.overlay-preview.loaded .viewport-inner { position: absolute; z-index: -1; left: 0; @@ -1395,46 +1395,46 @@ body { text-align: center; letter-spacing: normal; } -.reveal .overlay.overlay-preview .x-frame-error { +.reveal > .overlay.overlay-preview .x-frame-error { opacity: 0; transition: opacity 0.3s ease 0.3s; } -.reveal .overlay.overlay-preview.loaded .x-frame-error { +.reveal > .overlay.overlay-preview.loaded .x-frame-error { opacity: 1; } -.reveal .overlay.overlay-preview.loaded .spinner { +.reveal > .overlay.overlay-preview.loaded .spinner { opacity: 0; visibility: hidden; -webkit-transform: scale(0.2); transform: scale(0.2); } -.reveal .overlay.overlay-help .viewport { +.reveal > .overlay.overlay-help .viewport { overflow: auto; color: #fff; } -.reveal .overlay.overlay-help .viewport .viewport-inner { +.reveal > .overlay.overlay-help .viewport .viewport-inner { width: 600px; margin: auto; padding: 20px 20px 80px 20px; text-align: center; letter-spacing: normal; } -.reveal .overlay.overlay-help .viewport .viewport-inner .title { +.reveal > .overlay.overlay-help .viewport .viewport-inner .title { font-size: 20px; } -.reveal .overlay.overlay-help .viewport .viewport-inner table { +.reveal > .overlay.overlay-help .viewport .viewport-inner table { border: 1px solid #fff; border-collapse: collapse; font-size: 16px; } -.reveal .overlay.overlay-help .viewport .viewport-inner table th, -.reveal .overlay.overlay-help .viewport .viewport-inner table td { +.reveal > .overlay.overlay-help .viewport .viewport-inner table th, +.reveal > .overlay.overlay-help .viewport .viewport-inner table td { width: 200px; padding: 14px; border: 1px solid #fff; vertical-align: middle; } -.reveal .overlay.overlay-help .viewport .viewport-inner table th { +.reveal > .overlay.overlay-help .viewport .viewport-inner table th { padding-top: 20px; padding-bottom: 20px; } diff --git a/css/reveal.scss b/css/reveal.scss index e6608d4..c82a297 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1416,10 +1416,10 @@ $controlsArrowAngleActive: 36deg; /********************************************* - * LINK PREVIEW OVERLAY + * OVERLAY FOR LINK PREVIEWS AND HELP *********************************************/ -.reveal .overlay { +.reveal > .overlay { position: absolute; top: 0; left: 0; @@ -1431,12 +1431,12 @@ $controlsArrowAngleActive: 36deg; visibility: hidden; transition: all 0.3s ease; } - .reveal .overlay.visible { + .reveal > .overlay.visible { opacity: 1; visibility: visible; } - .reveal .overlay .spinner { + .reveal > .overlay .spinner { position: absolute; display: block; top: 50%; @@ -1452,7 +1452,7 @@ $controlsArrowAngleActive: 36deg; transition: all 0.3s ease; } - .reveal .overlay header { + .reveal > .overlay header { position: absolute; left: 0; top: 0; @@ -1461,7 +1461,7 @@ $controlsArrowAngleActive: 36deg; z-index: 2; border-bottom: 1px solid #222; } - .reveal .overlay header a { + .reveal > .overlay header a { display: inline-block; width: 40px; height: 40px; @@ -1472,10 +1472,10 @@ $controlsArrowAngleActive: 36deg; box-sizing: border-box; } - .reveal .overlay header a:hover { + .reveal > .overlay header a:hover { opacity: 1; } - .reveal .overlay header a .icon { + .reveal > .overlay header a .icon { display: inline-block; width: 20px; height: 20px; @@ -1484,14 +1484,14 @@ $controlsArrowAngleActive: 36deg; background-size: 100%; background-repeat: no-repeat; } - .reveal .overlay header a.close .icon { + .reveal > .overlay header a.close .icon { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABkklEQVRYR8WX4VHDMAxG6wnoJrABZQPYBCaBTWAD2g1gE5gg6OOsXuxIlr40d81dfrSJ9V4c2VLK7spHuTJ/5wpM07QXuXc5X0opX2tEJcadjHuV80li/FgxTIEK/5QBCICBD6xEhSMGHgQPgBgLiYVAB1dpSqKDawxTohFw4JSEA3clzgIBPCURwE2JucBR7rhPJJv5OpJwDX+SfDjgx1wACQeJG1aChP9K/IMmdZ8DtESV1WyP3Bt4MwM6sj4NMxMYiqUWHQu4KYA/SYkIjOsm3BXYWMKFDwU2khjCQ4ELJUJ4SmClRArOCmSXGuKma0fYD5CbzHxFpCSGAhfAVSSUGDUk2BWZaff2g6GE15BsBQ9nwmpIGDiyHQddwNTMKkbZaf9fajXQca1EX44puJZUsnY0ObGmITE3GVLCbEhQUjGVt146j6oasWN+49Vph2w1pZ5EansNZqKBm1txbU57iRRcZ86RWMDdWtBJUHBHwoQPi1GV+JCbntmvok7iTX4/Up9mgyTc/FJYDTcndgH/AA5A/CHsyEkVAAAAAElFTkSuQmCC); } - .reveal .overlay header a.external .icon { + .reveal > .overlay header a.external .icon { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAcElEQVRYR+2WSQoAIQwEzf8f7XiOMkUQxUPlGkM3hVmiQfQR9GYnH1SsAQlI4DiBqkCMoNb9y2e90IAEJPAcgdznU9+engMaeJ7Azh5Y1U67gAho4DqBqmB1buAf0MB1AlVBek83ZPkmJMGc1wAR+AAqod/B97TRpQAAAABJRU5ErkJggg==); } - .reveal .overlay .viewport { + .reveal > .overlay .viewport { position: absolute; display: flex; top: 40px; @@ -1500,7 +1500,7 @@ $controlsArrowAngleActive: 36deg; left: 0; } - .reveal .overlay.overlay-preview .viewport iframe { + .reveal > .overlay.overlay-preview .viewport iframe { width: 100%; height: 100%; max-width: 100%; @@ -1512,12 +1512,12 @@ $controlsArrowAngleActive: 36deg; transition: all 0.3s ease; } - .reveal .overlay.overlay-preview.loaded .viewport iframe { + .reveal > .overlay.overlay-preview.loaded .viewport iframe { opacity: 1; visibility: visible; } - .reveal .overlay.overlay-preview.loaded .viewport-inner { + .reveal > .overlay.overlay-preview.loaded .viewport-inner { position: absolute; z-index: -1; left: 0; @@ -1526,26 +1526,26 @@ $controlsArrowAngleActive: 36deg; text-align: center; letter-spacing: normal; } - .reveal .overlay.overlay-preview .x-frame-error { + .reveal > .overlay.overlay-preview .x-frame-error { opacity: 0; transition: opacity 0.3s ease 0.3s; } - .reveal .overlay.overlay-preview.loaded .x-frame-error { + .reveal > .overlay.overlay-preview.loaded .x-frame-error { opacity: 1; } - .reveal .overlay.overlay-preview.loaded .spinner { + .reveal > .overlay.overlay-preview.loaded .spinner { opacity: 0; visibility: hidden; transform: scale(0.2); } - .reveal .overlay.overlay-help .viewport { + .reveal > .overlay.overlay-help .viewport { overflow: auto; color: #fff; } - .reveal .overlay.overlay-help .viewport .viewport-inner { + .reveal > .overlay.overlay-help .viewport .viewport-inner { width: 600px; margin: auto; padding: 20px 20px 80px 20px; @@ -1553,25 +1553,25 @@ $controlsArrowAngleActive: 36deg; letter-spacing: normal; } - .reveal .overlay.overlay-help .viewport .viewport-inner .title { + .reveal > .overlay.overlay-help .viewport .viewport-inner .title { font-size: 20px; } - .reveal .overlay.overlay-help .viewport .viewport-inner table { + .reveal > .overlay.overlay-help .viewport .viewport-inner table { border: 1px solid #fff; border-collapse: collapse; font-size: 16px; } - .reveal .overlay.overlay-help .viewport .viewport-inner table th, - .reveal .overlay.overlay-help .viewport .viewport-inner table td { + .reveal > .overlay.overlay-help .viewport .viewport-inner table th, + .reveal > .overlay.overlay-help .viewport .viewport-inner table td { width: 200px; padding: 14px; border: 1px solid #fff; vertical-align: middle; } - .reveal .overlay.overlay-help .viewport .viewport-inner table th { + .reveal > .overlay.overlay-help .viewport .viewport-inner table th { padding-top: 20px; padding-bottom: 20px; } -- cgit v1.2.3 From 6abc6e00581e66690416978de118145e854c3c1e Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 25 Oct 2018 13:33:19 +0200 Subject: move reset.css out of reveal.css to make it optional #1952 #2248 --- css/reset.css | 30 ++++++++++++++++++++++++++++++ css/reveal.css | 28 +--------------------------- css/reveal.scss | 32 +------------------------------- demo.html | 1 + 4 files changed, 33 insertions(+), 58 deletions(-) create mode 100644 css/reset.css (limited to 'css') diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..e238539 --- /dev/null +++ b/css/reset.css @@ -0,0 +1,30 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v4.0 | 20180602 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +main, menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, main, menu, nav, section { + display: block; +} \ No newline at end of file diff --git a/css/reveal.css b/css/reveal.css index f4f8b88..809d159 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -5,33 +5,6 @@ * * Copyright (C) 2018 Hakim El Hattab, http://hakim.se */ -/********************************************* - * RESET STYLES - *********************************************/ -html, body, .reveal div, .reveal span, .reveal applet, .reveal object, .reveal iframe, -.reveal h1, .reveal h2, .reveal h3, .reveal h4, .reveal h5, .reveal h6, .reveal p, .reveal blockquote, .reveal pre, -.reveal a, .reveal abbr, .reveal acronym, .reveal address, .reveal big, .reveal cite, .reveal code, -.reveal del, .reveal dfn, .reveal em, .reveal img, .reveal ins, .reveal kbd, .reveal q, .reveal s, .reveal samp, -.reveal small, .reveal strike, .reveal strong, .reveal sub, .reveal sup, .reveal tt, .reveal var, -.reveal b, .reveal u, .reveal center, -.reveal dl, .reveal dt, .reveal dd, .reveal ol, .reveal ul, .reveal li, -.reveal fieldset, .reveal form, .reveal label, .reveal legend, -.reveal table, .reveal caption, .reveal tbody, .reveal tfoot, .reveal thead, .reveal tr, .reveal th, .reveal td, -.reveal article, .reveal aside, .reveal canvas, .reveal details, .reveal embed, -.reveal figure, .reveal figcaption, .reveal footer, .reveal header, .reveal hgroup, -.reveal menu, .reveal nav, .reveal output, .reveal ruby, .reveal section, .reveal summary, -.reveal time, .reveal mark, .reveal audio, .reveal video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; } - -.reveal article, .reveal aside, .reveal details, .reveal figcaption, .reveal figure, -.reveal footer, .reveal header, .reveal hgroup, .reveal menu, .reveal nav, .reveal section { - display: block; } - /********************************************* * GLOBAL STYLES *********************************************/ @@ -44,6 +17,7 @@ body { body { position: relative; line-height: 1; + margin: 0; background-color: #fff; color: #000; } diff --git a/css/reveal.scss b/css/reveal.scss index c82a297..2a50ccc 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -7,37 +7,6 @@ */ -/********************************************* - * RESET STYLES - *********************************************/ - -html, body, .reveal div, .reveal span, .reveal applet, .reveal object, .reveal iframe, -.reveal h1, .reveal h2, .reveal h3, .reveal h4, .reveal h5, .reveal h6, .reveal p, .reveal blockquote, .reveal pre, -.reveal a, .reveal abbr, .reveal acronym, .reveal address, .reveal big, .reveal cite, .reveal code, -.reveal del, .reveal dfn, .reveal em, .reveal img, .reveal ins, .reveal kbd, .reveal q, .reveal s, .reveal samp, -.reveal small, .reveal strike, .reveal strong, .reveal sub, .reveal sup, .reveal tt, .reveal var, -.reveal b, .reveal u, .reveal center, -.reveal dl, .reveal dt, .reveal dd, .reveal ol, .reveal ul, .reveal li, -.reveal fieldset, .reveal form, .reveal label, .reveal legend, -.reveal table, .reveal caption, .reveal tbody, .reveal tfoot, .reveal thead, .reveal tr, .reveal th, .reveal td, -.reveal article, .reveal aside, .reveal canvas, .reveal details, .reveal embed, -.reveal figure, .reveal figcaption, .reveal footer, .reveal header, .reveal hgroup, -.reveal menu, .reveal nav, .reveal output, .reveal ruby, .reveal section, .reveal summary, -.reveal time, .reveal mark, .reveal audio, .reveal video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} - -.reveal article, .reveal aside, .reveal details, .reveal figcaption, .reveal figure, -.reveal footer, .reveal header, .reveal hgroup, .reveal menu, .reveal nav, .reveal section { - display: block; -} - - /********************************************* * GLOBAL STYLES *********************************************/ @@ -52,6 +21,7 @@ body { body { position: relative; line-height: 1; + margin: 0; background-color: #fff; color: #000; diff --git a/demo.html b/demo.html index 71f0c4c..3e03f8e 100644 --- a/demo.html +++ b/demo.html @@ -14,6 +14,7 @@ + -- cgit v1.2.3 From 8e5bdcc2bb87da2255e5a8d3285e164c52d9fbda Mon Sep 17 00:00:00 2001 From: Arno Lepisk Date: Tue, 30 Oct 2018 22:03:13 +0100 Subject: Make code font customizable for themes. --- css/theme/template/settings.scss | 4 +++- css/theme/template/theme.scss | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'css') diff --git a/css/theme/template/settings.scss b/css/theme/template/settings.scss index 63c02cf..5a917f8 100644 --- a/css/theme/template/settings.scss +++ b/css/theme/template/settings.scss @@ -28,6 +28,8 @@ $heading2Size: 2.11em; $heading3Size: 1.55em; $heading4Size: 1.00em; +$codeFont: monospace; + // Links and actions $linkColor: #13DAEC; $linkColorHover: lighten( $linkColor, 20% ); @@ -40,4 +42,4 @@ $selectionColor: #fff; // to return a background image or gradient @mixin bodyBackground() { background: $backgroundColor; -} \ No newline at end of file +} diff --git a/css/theme/template/theme.scss b/css/theme/template/theme.scss index a8f142d..215e2d4 100644 --- a/css/theme/template/theme.scss +++ b/css/theme/template/theme.scss @@ -162,7 +162,7 @@ body { text-align: left; font-size: 0.55em; - font-family: monospace; + font-family: $codeFont; line-height: 1.2em; word-wrap: break-word; @@ -171,7 +171,7 @@ body { } .reveal code { - font-family: monospace; + font-family: $codeFont; text-transform: none; } -- cgit v1.2.3 From bc2477bf107193c0a6e2988bbc5c5828e7c32a68 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 31 Oct 2018 09:20:12 +0100 Subject: fix no-transform mode --- css/reveal.css | 23 ++++++++++++----------- css/reveal.scss | 25 +++++++++++++------------ 2 files changed, 25 insertions(+), 23 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index 809d159..b024bd0 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -963,34 +963,35 @@ body { .no-transforms { overflow-y: auto; } +.no-transforms .reveal { + overflow: visible; } + .no-transforms .reveal .slides { position: relative; width: 80%; - height: auto !important; + max-width: 1280px; + height: auto; top: 0; - left: 50%; - margin: 0; + margin: 0 auto; text-align: center; } .no-transforms .reveal .controls, .no-transforms .reveal .progress { - display: none !important; } + display: none; } .no-transforms .reveal .slides section { - display: block !important; - opacity: 1 !important; - position: relative !important; + display: block; + opacity: 1; + position: relative; height: auto; min-height: 0; top: 0; - left: -50%; + left: 0; + margin: 10vh 0; margin: 70px 0; -webkit-transform: none; transform: none; } -.no-transforms .reveal .slides section section { - left: 0; } - .reveal .no-transition, .reveal .no-transition * { transition: none !important; } diff --git a/css/reveal.scss b/css/reveal.scss index 2a50ccc..eeed56b 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1037,37 +1037,38 @@ $controlsArrowAngleActive: 36deg; overflow-y: auto; } +.no-transforms .reveal { + overflow: visible; +} + .no-transforms .reveal .slides { position: relative; width: 80%; - height: auto !important; + max-width: 1280px; + height: auto; top: 0; - left: 50%; - margin: 0; + margin: 0 auto; text-align: center; } .no-transforms .reveal .controls, .no-transforms .reveal .progress { - display: none !important; + display: none; } .no-transforms .reveal .slides section { - display: block !important; - opacity: 1 !important; - position: relative !important; + display: block; + opacity: 1; + position: relative; height: auto; min-height: 0; top: 0; - left: -50%; + left: 0; + margin: 10vh 0; margin: 70px 0; transform: none; } -.no-transforms .reveal .slides section section { - left: 0; -} - .reveal .no-transition, .reveal .no-transition * { transition: none !important; -- cgit v1.2.3 From b6ce0a9724f123396b59e9b7b90ab2d44dda2534 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 8 Nov 2018 14:05:53 +0100 Subject: fix concave/convex transitions on vertical slides #1947 --- css/reveal.css | 3 ++- css/reveal.scss | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index b024bd0..4a9c604 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -486,7 +486,8 @@ body { perspective-origin: 50% 40%; } .reveal .slides > section { - -ms-perspective: 600px; } + -webkit-perspective: 600px; + perspective: 600px; } .reveal .slides > section, .reveal .slides > section > section { diff --git a/css/reveal.scss b/css/reveal.scss index eeed56b..63d1d45 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -588,7 +588,7 @@ $controlsArrowAngleActive: 36deg; } .reveal .slides>section { - -ms-perspective: 600px; + perspective: 600px; } .reveal .slides>section, -- cgit v1.2.3 From 6fe0cbc0dde8a3409194eb1f346ae18313a9c2c5 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 17 Dec 2018 12:58:55 +0100 Subject: prefer vh for speaker notes layout --- css/reveal.css | 11 ++++++++--- css/reveal.scss | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index 4a9c604..dc12ee4 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1531,19 +1531,24 @@ body { border-left: 0; max-width: none; max-height: 70%; + max-height: 70vh; overflow: visible; } .reveal.show-notes .speaker-notes { top: 100%; left: 0; width: 100%; - height: 42.8571428571%; } } + height: 42.8571428571%; + height: 30vh; + border: 0; } } @media screen and (max-width: 600px) { .reveal.show-notes { - max-height: 60%; } + max-height: 60%; + max-height: 60vh; } .reveal.show-notes .speaker-notes { top: 100%; - height: 66.6666666667%; } + height: 66.6666666667%; + height: 40vh; } .reveal .speaker-notes { font-size: 14px; } } diff --git a/css/reveal.scss b/css/reveal.scss index 63d1d45..8715762 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1684,6 +1684,7 @@ $controlsArrowAngleActive: 36deg; border-left: 0; max-width: none; max-height: 70%; + max-height: 70vh; overflow: visible; } @@ -1692,17 +1693,21 @@ $controlsArrowAngleActive: 36deg; left: 0; width: 100%; height: (30/0.7)*1%; + height: 30vh; + border: 0; } } @media screen and (max-width: 600px) { .reveal.show-notes { max-height: 60%; + max-height: 60vh; } .reveal.show-notes .speaker-notes { top: 100%; height: (40/0.6)*1%; + height: 40vh; } .reveal .speaker-notes { -- cgit v1.2.3 From 9f1856d55be7b6ddb5df0df5d06f579966233822 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 18 Dec 2018 10:14:18 +0100 Subject: fix notes layout when container isnt as wide as viewport --- css/reveal.css | 4 ++-- css/reveal.scss | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index dc12ee4..ebc399f 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1488,7 +1488,7 @@ body { .reveal .speaker-notes { display: none; position: absolute; - width: 25vw; + width: 33.3333333333%; height: 100%; top: 0; left: 100%; @@ -1516,7 +1516,7 @@ body { opacity: 0.5; } .reveal.show-notes { - max-width: 75vw; + max-width: 75%; overflow: visible; } .reveal.show-notes .speaker-notes { diff --git a/css/reveal.scss b/css/reveal.scss index 8715762..75ffb72 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1619,6 +1619,8 @@ $controlsArrowAngleActive: 36deg; * SPEAKER NOTES *********************************************/ +$notesWidthPercent: 25%; + // Hide on-page notes .reveal aside.notes { display: none; @@ -1629,7 +1631,7 @@ $controlsArrowAngleActive: 36deg; .reveal .speaker-notes { display: none; position: absolute; - width: 25vw; + width: $notesWidthPercent / (1-$notesWidthPercent/100) * 1%; height: 100%; top: 0; left: 100%; @@ -1665,7 +1667,7 @@ $controlsArrowAngleActive: 36deg; .reveal.show-notes { - max-width: 75vw; + max-width: 100% - $notesWidthPercent; overflow: visible; } -- cgit v1.2.3 From c36caef5e7f2a448df8503ff8eb37defea297152 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 10 Jan 2019 14:58:38 +0100 Subject: 2019 --- Gruntfile.js | 2 +- LICENSE | 2 +- README.md | 2 +- css/reveal.css | 2 +- css/reveal.scss | 2 +- js/reveal.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'css') diff --git a/Gruntfile.js b/Gruntfile.js index 8d8300b..59ad896 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,7 +15,7 @@ module.exports = function(grunt) { ' * http://revealjs.com\n' + ' * MIT licensed\n' + ' *\n' + - ' * Copyright (C) 2018 Hakim El Hattab, http://hakim.se\n' + + ' * Copyright (C) 2019 Hakim El Hattab, http://hakim.se\n' + ' */' }, diff --git a/LICENSE b/LICENSE index 1b8b5a7..697d156 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2018 Hakim El Hattab, http://hakim.se, and reveal.js contributors +Copyright (C) 2019 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 diff --git a/README.md b/README.md index bd3965f..8028e82 100644 --- a/README.md +++ b/README.md @@ -1349,4 +1349,4 @@ If you want to include math inside of a presentation written in Markdown you nee MIT licensed -Copyright (C) 2018 Hakim El Hattab, http://hakim.se +Copyright (C) 2019 Hakim El Hattab, http://hakim.se diff --git a/css/reveal.css b/css/reveal.css index ebc399f..5de7b4c 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -3,7 +3,7 @@ * http://revealjs.com * MIT licensed * - * Copyright (C) 2018 Hakim El Hattab, http://hakim.se + * Copyright (C) 2019 Hakim El Hattab, http://hakim.se */ /********************************************* * GLOBAL STYLES diff --git a/css/reveal.scss b/css/reveal.scss index 75ffb72..7e75dde 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -3,7 +3,7 @@ * http://revealjs.com * MIT licensed * - * Copyright (C) 2018 Hakim El Hattab, http://hakim.se + * Copyright (C) 2019 Hakim El Hattab, http://hakim.se */ diff --git a/js/reveal.js b/js/reveal.js index 9e14fb9..afd678b 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -3,7 +3,7 @@ * http://revealjs.com * MIT licensed * - * Copyright (C) 2018 Hakim El Hattab, http://hakim.se + * Copyright (C) 2019 Hakim El Hattab, http://hakim.se */ (function( root, factory ) { if( typeof define === 'function' && define.amd ) { -- cgit v1.2.3 From 5002304fb119859fe0d115883acceb094bc41be0 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 22 Jan 2019 09:45:33 +0100 Subject: correct height of reveal.js on mobile devices, fixes vertical overflow --- css/reveal.css | 5 +---- css/reveal.scss | 11 +---------- js/reveal.js | 10 ++++++++++ 3 files changed, 12 insertions(+), 14 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index 5de7b4c..c685926 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -12,6 +12,7 @@ html, body { width: 100%; height: 100%; + height: calc( var(--vh, 1vh) * 100); overflow: hidden; } body { @@ -463,10 +464,6 @@ body { -ms-touch-action: none; touch-action: none; } -@media only screen and (orientation: landscape) { - .reveal.ua-iphone { - position: fixed; } } - .reveal .slides { position: absolute; width: 100%; diff --git a/css/reveal.scss b/css/reveal.scss index 7e75dde..7bec964 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -15,6 +15,7 @@ html, body { width: 100%; height: 100%; + height: calc( var(--vh, 1vh) * 100 ); overflow: hidden; } @@ -559,16 +560,6 @@ $controlsArrowAngleActive: 36deg; touch-action: none; } -// Mobile Safari sometimes overlays a header at the top -// of the page when in landscape mode. Using fixed -// positioning ensures that reveal.js reduces its height -// when this header is visible. -@media only screen and (orientation : landscape) { - .reveal.ua-iphone { - position: fixed; - } -} - .reveal .slides { position: absolute; width: 100%; diff --git a/js/reveal.js b/js/reveal.js index afd678b..88ce029 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -2065,6 +2065,16 @@ if( !config.disableLayout ) { + // On some mobile devices '100vh' is taller than the visible + // viewport which leads to part of the presentation being + // cut off. To work around this we define our own '--vh' custom + // property where 100x adds up to the correct height. + // + // https://css-tricks.com/the-trick-to-viewport-units-on-mobile/ + if( isMobileDevice ) { + document.documentElement.style.setProperty( '--vh', ( window.innerHeight * 0.01 ) + 'px' ); + } + var size = getComputedSlideSize(); // Layout the contents of the slides -- cgit v1.2.3 From 41858b91d53a620825f4d72bb87f8168939b9db0 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 22 Jan 2019 10:02:08 +0100 Subject: adjust how global height is styled --- css/reveal.css | 5 +++-- css/reveal.scss | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index c685926..c865325 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -8,14 +8,15 @@ /********************************************* * GLOBAL STYLES *********************************************/ -html, -body { +html { width: 100%; height: 100%; + height: 100vh; height: calc( var(--vh, 1vh) * 100); overflow: hidden; } body { + height: 100%; position: relative; line-height: 1; margin: 0; diff --git a/css/reveal.scss b/css/reveal.scss index 7bec964..e7d2981 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -11,15 +11,16 @@ * GLOBAL STYLES *********************************************/ -html, -body { +html { width: 100%; height: 100%; + height: 100vh; height: calc( var(--vh, 1vh) * 100 ); overflow: hidden; } body { + height: 100%; position: relative; line-height: 1; margin: 0; -- cgit v1.2.3 From ddd9f818f32c3bc485b7fc52cc6438ec53adf3b9 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 22 Jan 2019 12:05:57 +0100 Subject: hide body overflow --- css/reveal.css | 1 + css/reveal.scss | 1 + 2 files changed, 2 insertions(+) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index c865325..d7442d6 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -17,6 +17,7 @@ html { body { height: 100%; + overflow: hidden; position: relative; line-height: 1; margin: 0; diff --git a/css/reveal.scss b/css/reveal.scss index e7d2981..c93276f 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -21,6 +21,7 @@ html { body { height: 100%; + overflow: hidden; position: relative; line-height: 1; margin: 0; -- cgit v1.2.3 From 481208f43fda7270a6ac628a412b32120bfc9018 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 23 Jan 2019 10:30:29 +0100 Subject: hide vertical arrows when navigationMode is 'linear' #2307 --- css/reveal.css | 6 ++++++ css/reveal.scss | 7 +++++++ js/reveal.js | 12 ++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index d7442d6..4a9f030 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -343,10 +343,16 @@ body { .reveal .controls .enabled.fragmented:hover { opacity: 1; } +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-up, +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-down { + display: none; } + +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-left, .reveal:not(.has-vertical-slides) .controls .navigate-left { bottom: 1.4em; right: 5.5em; } +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-right, .reveal:not(.has-vertical-slides) .controls .navigate-right { bottom: 1.4em; right: 0.5em; } diff --git a/css/reveal.scss b/css/reveal.scss index c93276f..c79a562 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -407,12 +407,19 @@ $controlsArrowAngleActive: 36deg; } } +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-up, +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-down { + display: none; +} + // Adjust the layout when there are no vertical slides +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-left, .reveal:not(.has-vertical-slides) .controls .navigate-left { bottom: $controlArrowSpacing; right: 0.5em + $controlArrowSpacing + $controlArrowSize; } +.reveal[data-navigation-mode="linear"].has-horizontal-slides .navigate-right, .reveal:not(.has-vertical-slides) .controls .navigate-right { bottom: $controlArrowSpacing; right: 0.5em; diff --git a/js/reveal.js b/js/reveal.js index ba69d1a..cee39e2 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -1362,6 +1362,14 @@ dom.slideNumber.style.display = slideNumberDisplay; + // Add the navigation mode to the DOM so we can adjust styling + if( config.navigationMode !== 'default' ) { + dom.wrapper.setAttribute( 'data-navigation-mode', config.navigationMode ); + } + else { + dom.wrapper.removeAttribute( 'data-navigation-mode' ); + } + sync(); } @@ -5316,8 +5324,8 @@ /** * Event handler for navigation control buttons. */ - function onNavigateLeftClicked( event ) { event.preventDefault(); onUserInput(); navigateLeft(); } - function onNavigateRightClicked( event ) { event.preventDefault(); onUserInput(); navigateRight(); } + function onNavigateLeftClicked( event ) { event.preventDefault(); onUserInput(); config.navigationMode === 'linear' ? navigatePrev() : navigateLeft(); } + function onNavigateRightClicked( event ) { event.preventDefault(); onUserInput(); config.navigationMode === 'linear' ? navigateNext() : navigateRight(); } function onNavigateUpClicked( event ) { event.preventDefault(); onUserInput(); navigateUp(); } function onNavigateDownClicked( event ) { event.preventDefault(); onUserInput(); navigateDown(); } function onNavigatePrevClicked( event ) { event.preventDefault(); onUserInput(); navigatePrev(); } -- cgit v1.2.3 From 6a2cb42e6b7bd8374d47552a4b0bb57b88a4f23f Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 30 Jan 2019 16:31:31 +0100 Subject: enable pinch-to-zoom for android --- css/reveal.css | 4 ++-- css/reveal.scss | 2 +- demo.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index 4a9f030..63ba646 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -469,8 +469,8 @@ body { width: 100%; height: 100%; overflow: hidden; - -ms-touch-action: none; - touch-action: none; } + -ms-touch-action: pinch-zoom; + touch-action: pinch-zoom; } .reveal .slides { position: absolute; diff --git a/css/reveal.scss b/css/reveal.scss index c79a562..ad6d1f5 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -566,7 +566,7 @@ $controlsArrowAngleActive: 36deg; width: 100%; height: 100%; overflow: hidden; - touch-action: none; + touch-action: pinch-zoom; } .reveal .slides { diff --git a/demo.html b/demo.html index 9471f8b..6269746 100644 --- a/demo.html +++ b/demo.html @@ -12,7 +12,7 @@ - + -- cgit v1.2.3 From 2d57981261056d47ef1c24fa82c6ad10c03e37ca Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Fri, 1 Feb 2019 11:09:03 +0100 Subject: zoom transition now uses zooming for vertical transitions, too --- css/reveal.css | 11 ++++++----- css/reveal.scss | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'css') diff --git a/css/reveal.css b/css/reveal.css index 63ba646..51820c7 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -524,7 +524,8 @@ body { .reveal .slides > section.stack { padding-top: 0; padding-bottom: 0; - pointer-events: none; } + pointer-events: none; + height: 100%; } .reveal .slides > section.present, .reveal .slides > section > section.present { @@ -741,14 +742,14 @@ body { .reveal .slides > section > section[data-transition=zoom].past, .reveal .slides > section > section[data-transition~=zoom-out].past, .reveal.zoom .slides > section > section:not([data-transition]).past { - -webkit-transform: translate(0, -150%); - transform: translate(0, -150%); } + -webkit-transform: scale(16); + transform: scale(16); } .reveal .slides > section > section[data-transition=zoom].future, .reveal .slides > section > section[data-transition~=zoom-in].future, .reveal.zoom .slides > section > section:not([data-transition]).future { - -webkit-transform: translate(0, 150%); - transform: translate(0, 150%); } + -webkit-transform: scale(0.2); + transform: scale(0.2); } /********************************************* * CUBE TRANSITION diff --git a/css/reveal.scss b/css/reveal.scss index ad6d1f5..8c14529 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -627,6 +627,7 @@ $controlsArrowAngleActive: 36deg; padding-top: 0; padding-bottom: 0; pointer-events: none; + height: 100%; } .reveal .slides>section.present, @@ -801,10 +802,10 @@ $controlsArrowAngleActive: 36deg; transform: scale(0.2); } @include transition-vertical-past(zoom) { - transform: translate(0, -150%); + transform: scale(16); } @include transition-vertical-future(zoom) { - transform: translate(0, 150%); + transform: scale(0.2); } -- cgit v1.2.3 From 213023760ab2cfaad4db022844da97e692c2ea50 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 28 Feb 2019 13:47:49 +0100 Subject: build dependency updates --- Gruntfile.ts | 5 ----- css/reveal.css | 6 +++--- package.json | 8 ++++---- test/test-markdown-external.html | 8 +++++--- test/test-pdf.html | 2 +- test/test.html | 6 +++--- 6 files changed, 16 insertions(+), 19 deletions(-) (limited to 'css') diff --git a/Gruntfile.ts b/Gruntfile.ts index f9c9dd6..1b7f31c 100644 --- a/Gruntfile.ts +++ b/Gruntfile.ts @@ -153,11 +153,6 @@ module.exports = function(grunt) { options: { livereload: true } - }, - - retire: { - js: [ 'js/reveal.js', 'lib/js/*.js', 'plugin/**/*.js' ], - node: [ '.' ] } }); diff --git a/css/reveal.css b/css/reveal.css index 51820c7..335fe82 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -249,7 +249,7 @@ body { visibility: hidden; opacity: 0; -webkit-appearance: none; - -webkit-tap-highlight-color: transparent; } + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } .reveal .controls .controls-arrow:before, .reveal .controls .controls-arrow:after { content: ''; @@ -1023,7 +1023,7 @@ body { opacity: 0; visibility: hidden; overflow: hidden; - background-color: transparent; + background-color: rgba(0, 0, 0, 0); transition: all 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985); } .reveal .slide-background-content { @@ -1430,7 +1430,7 @@ body { z-index: 30; cursor: pointer; transition: all 400ms ease; - -webkit-tap-highlight-color: transparent; } + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } .reveal.overview .playback { opacity: 0; diff --git a/package.json b/package.json index c628f85..cd6ccbe 100644 --- a/package.json +++ b/package.json @@ -28,15 +28,15 @@ "grunt-cli": "^1.3.2", "grunt-autoprefixer": "^3.0.4", "grunt-contrib-connect": "^2.0.0", - "grunt-contrib-cssmin": "^2.2.1", + "grunt-contrib-cssmin": "^3.0.0", "grunt-contrib-jshint": "^2.0.0", - "grunt-contrib-qunit": "^2.0.0", + "grunt-contrib-qunit": "^3.1.0", "grunt-contrib-uglify": "^3.3.0", "grunt-contrib-watch": "^1.1.0", - "grunt-retire": "^1.0.7", - "grunt-sass": "^1.0.0", + "grunt-sass": "^3.0.2", "grunt-zip": "~0.17.1", "load-grunt-tasks": "^4.0.0", + "node-sass": "4.11.0", "mustache": "^2.3.0", "socket.io": "^2.2.0", "typescript": "^3.3.3333" diff --git a/test/test-markdown-external.html b/test/test-markdown-external.html index 76c6ae6..93cd983 100644 --- a/test/test-markdown-external.html +++ b/test/test-markdown-external.html @@ -13,12 +13,12 @@
- + @@ -29,7 +29,9 @@ - + + +