diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-12-13 16:16:51 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-12-13 16:16:51 +0100 |
| commit | f2bd9d297018e1af97ebee147a8824bfb61c2bed (patch) | |
| tree | 214db770f07b4f1b58dbe5eb2b808297788caf03 | |
| parent | 001d4d94d30dffc3e82a7be0300147f755618aa4 (diff) | |
| download | freenode-live-2017-presentation-f2bd9d297018e1af97ebee147a8824bfb61c2bed.tar freenode-live-2017-presentation-f2bd9d297018e1af97ebee147a8824bfb61c2bed.tar.gz | |
don't show error message while iframe fades in #1577
| -rw-r--r-- | css/reveal.css | 18 | ||||
| -rw-r--r-- | css/reveal.scss | 10 | ||||
| -rw-r--r-- | js/reveal.js | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/css/reveal.css b/css/reveal.css index dbabfcb..80c1786 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 321b3f9..fa7f20d 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 e9dba2e..7a4bc9e 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -1604,7 +1604,7 @@ '<div class="viewport">', '<iframe src="'+ url +'"></iframe>', '<small class="viewport-inner">', - 'This link is refused to display in a frame due to its policy', + '<span class="x-frame-error">Unable to load iframe. This is likely due to the site\'s policy (x-frame-options).</span>', '</small>', '</div>' ].join(''); |