From f2bd9d297018e1af97ebee147a8824bfb61c2bed Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Tue, 13 Dec 2016 16:16:51 +0100 Subject: [PATCH] don't show error message while iframe fades in #1577 --- css/reveal.css | 18 ++++++++++++++++++ css/reveal.scss | 10 +++++++++- js/reveal.js | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/css/reveal.css b/css/reveal.css index dbabfcb2..80c17863 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1140,6 +1140,7 @@ body { display: inline-block; width: 40px; height: 40px; + line-height: 36px; padding: 0 10px; float: right; opacity: 0.6; @@ -1188,6 +1189,23 @@ body { opacity: 1; visibility: visible; } +.reveal .overlay.overlay-preview.loaded .viewport-inner { + position: absolute; + z-index: -1; + left: 0; + top: 45%; + width: 100%; + text-align: center; + letter-spacing: normal; } + +.reveal .overlay.overlay-preview .x-frame-error { + opacity: 0; + -webkit-transition: opacity 0.3s ease 0.3s; + transition: opacity 0.3s ease 0.3s; } + +.reveal .overlay.overlay-preview.loaded .x-frame-error { + opacity: 1; } + .reveal .overlay.overlay-preview.loaded .spinner { opacity: 0; visibility: hidden; diff --git a/css/reveal.scss b/css/reveal.scss index 321b3f9e..fa7f20d8 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1195,6 +1195,7 @@ body { display: inline-block; width: 40px; height: 40px; + line-height: 36px; padding: 0 10px; float: right; opacity: 0.6; @@ -1250,11 +1251,18 @@ body { position: absolute; z-index: -1; left: 0; - top: 60px; + top: 45%; width: 100%; text-align: center; letter-spacing: normal; } + .reveal .overlay.overlay-preview .x-frame-error { + opacity: 0; + transition: opacity 0.3s ease 0.3s; + } + .reveal .overlay.overlay-preview.loaded .x-frame-error { + opacity: 1; + } .reveal .overlay.overlay-preview.loaded .spinner { opacity: 0; diff --git a/js/reveal.js b/js/reveal.js index e9dba2eb..7a4bc9e1 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -1604,7 +1604,7 @@ '
', '', '', - 'This link is refused to display in a frame due to its policy', + 'Unable to load iframe. This is likely due to the site\'s policy (x-frame-options).', '', '
' ].join('');