From a61a372b5215fbdf1fa3bab5a4c21ca511bfbe07 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 16 Oct 2014 12:19:20 +0200 Subject: use nesting for fragment styles --- css/reveal.scss | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'css/reveal.scss') diff --git a/css/reveal.scss b/css/reveal.scss index 0d1fb82..b07643b 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -78,69 +78,84 @@ body { opacity: 0; visibility: hidden; transition: all .2s ease; -} - .reveal .slides section .fragment.visible { + + &.visible { opacity: 1; visibility: visible; } +} .reveal .slides section .fragment.grow { opacity: 1; visibility: visible; -} - .reveal .slides section .fragment.grow.visible { + + &.visible { transform: scale( 1.3 ); } +} .reveal .slides section .fragment.shrink { opacity: 1; visibility: visible; -} - .reveal .slides section .fragment.shrink.visible { + + &.visible { transform: scale( 0.7 ); } +} .reveal .slides section .fragment.zoom-in { transform: scale( 0.1 ); -} - .reveal .slides section .fragment.zoom-in.visible { + &.visible { transform: scale( 1 ); } +} .reveal .slides section .fragment.roll-in { transform: rotateX( 90deg ); -} - .reveal .slides section .fragment.roll-in.visible { + + &.visible { transform: rotateX( 0 ); } +} .reveal .slides section .fragment.fade-out { opacity: 1; visibility: visible; -} - .reveal .slides section .fragment.fade-out.visible { + + &.visible { opacity: 0; visibility: hidden; } +} .reveal .slides section .fragment.semi-fade-out { opacity: 1; visibility: visible; -} - .reveal .slides section .fragment.semi-fade-out.visible { + + &.visible { opacity: 0.5; visibility: visible; } +} + +.reveal .slides section .fragment.strike { + opacity: 1; + + &.visible { + text-decoration: line-through; + } +} .reveal .slides section .fragment.current-visible { opacity: 0; visibility: hidden; -} - .reveal .slides section .fragment.current-visible.current-fragment { + + &.current-fragment { opacity: 1; visibility: visible; } +} .reveal .slides section .fragment.highlight-red, .reveal .slides section .fragment.highlight-current-red, @@ -171,13 +186,6 @@ body { color: #1b91ff; } -.reveal .slides section .fragment.strike { - opacity: 1; -} - .reveal .slides section .fragment.strike.visible { - text-decoration: line-through; - } - /********************************************* * DEFAULT ELEMENT STYLES -- cgit v1.2.3 From 1f5369a43ec9d690298c633fcb6c0d595bb1ca04 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 16 Oct 2014 13:35:47 +0200 Subject: correct defaults for min-height, thanks @sebastianz #985 --- css/reveal.css | 6 +++--- css/reveal.scss | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'css/reveal.scss') diff --git a/css/reveal.css b/css/reveal.css index ed380ab..50432e4 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -340,7 +340,7 @@ body { opacity: 1; } .reveal.center, .reveal.center .slides, .reveal.center .slides section { - min-height: auto !important; } + min-height: 0 !important; } /* Don't allow interaction with invisible slides */ .reveal .slides > section.future, .reveal .slides > section > section.future, .reveal .slides > section.past, .reveal .slides > section > section.past { @@ -464,7 +464,7 @@ body { box-sizing: border-box; } .reveal.center.cube .slides section { - min-height: auto; } + min-height: 0; } .reveal.cube .slides section:not(.stack):before { content: ''; @@ -714,7 +714,7 @@ body { opacity: 1 !important; position: relative !important; height: auto; - min-height: auto; + min-height: 0; top: 0; left: -50%; margin: 70px 0; diff --git a/css/reveal.scss b/css/reveal.scss index b07643b..7f07b46 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -423,7 +423,7 @@ body { .reveal.center, .reveal.center .slides, .reveal.center .slides section { - min-height: auto !important; + min-height: 0 !important; } /* Don't allow interaction with invisible slides */ @@ -584,7 +584,7 @@ body { box-sizing: border-box; } .reveal.center.cube .slides section { - min-height: auto; + min-height: 0; } .reveal.cube .slides section:not(.stack):before { content: ''; @@ -837,7 +837,7 @@ body { opacity: 1 !important; position: relative !important; height: auto; - min-height: auto; + min-height: 0; top: 0; left: -50%; margin: 70px 0; -- cgit v1.2.3 From 2cfe1174f1359b5a4378b003ca032b4929f02ba3 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Sat, 27 Dec 2014 21:22:17 +0100 Subject: kill unintended transition into overview mode --- css/reveal.css | 2 -- css/reveal.scss | 1 - 2 files changed, 3 deletions(-) (limited to 'css/reveal.scss') diff --git a/css/reveal.css b/css/reveal.css index 50432e4..633fcd2 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -290,8 +290,6 @@ body { overflow: visible; z-index: 1; text-align: center; - -webkit-transition: -webkit-perspective 0.4s ease; - transition: perspective 0.4s ease; -webkit-perspective: 600px; perspective: 600px; -webkit-perspective-origin: 50% 40%; diff --git a/css/reveal.scss b/css/reveal.scss index 7f07b46..41cc71a 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -368,7 +368,6 @@ body { overflow: visible; z-index: 1; text-align: center; - transition: perspective .4s ease; perspective: 600px; perspective-origin: 50% 40%; } -- cgit v1.2.3 From 5bdbc2dc7b4c957f6df6540bdccc29e00c2e49a3 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Sat, 27 Dec 2014 21:27:53 +0100 Subject: remove deprecated data-state background colors --- css/reveal.css | 38 -------------------------------------- css/reveal.scss | 40 ---------------------------------------- js/reveal.js | 3 --- 3 files changed, 81 deletions(-) (limited to 'css/reveal.scss') diff --git a/css/reveal.css b/css/reveal.css index 633fcd2..43acebb 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -727,44 +727,6 @@ body { -webkit-transition: none !important; transition: none !important; } -/********************************************* - * BACKGROUND STATES [DEPRECATED] - *********************************************/ -.reveal .state-background { - position: absolute; - width: 100%; - height: 100%; - background: rgba(0, 0, 0, 0); - -webkit-transition: background 800ms ease; - transition: background 800ms ease; } - -.alert .reveal .state-background { - background: rgba(200, 50, 30, 0.6); } - -.soothe .reveal .state-background { - background: rgba(50, 200, 90, 0.4); } - -.blackout .reveal .state-background { - background: rgba(0, 0, 0, 0.6); } - -.whiteout .reveal .state-background { - background: rgba(255, 255, 255, 0.6); } - -.cobalt .reveal .state-background { - background: rgba(22, 152, 213, 0.6); } - -.mint .reveal .state-background { - background: rgba(22, 213, 75, 0.6); } - -.submerge .reveal .state-background { - background: rgba(12, 25, 77, 0.6); } - -.lila .reveal .state-background { - background: rgba(180, 50, 140, 0.6); } - -.sunset .reveal .state-background { - background: rgba(255, 122, 0, 0.6); } - /********************************************* * PER-SLIDE BACKGROUNDS *********************************************/ diff --git a/css/reveal.scss b/css/reveal.scss index 41cc71a..b731c9b 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -853,46 +853,6 @@ body { } -/********************************************* - * BACKGROUND STATES [DEPRECATED] - *********************************************/ - -.reveal .state-background { - position: absolute; - width: 100%; - height: 100%; - background: rgba( 0, 0, 0, 0 ); - transition: background 800ms ease; -} -.alert .reveal .state-background { - background: rgba( 200, 50, 30, 0.6 ); -} -.soothe .reveal .state-background { - background: rgba( 50, 200, 90, 0.4 ); -} -.blackout .reveal .state-background { - background: rgba( 0, 0, 0, 0.6 ); -} -.whiteout .reveal .state-background { - background: rgba( 255, 255, 255, 0.6 ); -} -.cobalt .reveal .state-background { - background: rgba( 22, 152, 213, 0.6 ); -} -.mint .reveal .state-background { - background: rgba( 22, 213, 75, 0.6 ); -} -.submerge .reveal .state-background { - background: rgba( 12, 25, 77, 0.6); -} -.lila .reveal .state-background { - background: rgba( 180, 50, 140, 0.6 ); -} -.sunset .reveal .state-background { - background: rgba( 255, 122, 0, 0.6 ); -} - - /********************************************* * PER-SLIDE BACKGROUNDS *********************************************/ diff --git a/js/reveal.js b/js/reveal.js index c8aa84a..224ce99 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -443,9 +443,6 @@ // Slide number dom.slideNumber = createSingletonNode( dom.wrapper, 'div', 'slide-number', '' ); - // State background element [DEPRECATED] - createSingletonNode( dom.wrapper, 'div', 'state-background', null ); - // Overlay graphic which is displayed during the paused mode createSingletonNode( dom.wrapper, 'div', 'pause-overlay', null ); -- cgit v1.2.3 From 9c3a7b49d0c9f39d6f65b9af4a90a5c3ff782343 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 5 Jan 2015 09:40:53 +0100 Subject: (c) 2015 --- 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/reveal.scss') diff --git a/Gruntfile.js b/Gruntfile.js index 97976e4..3e67b9f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,7 +11,7 @@ module.exports = function(grunt) { ' * http://lab.hakim.se/reveal-js\n' + ' * MIT licensed\n' + ' *\n' + - ' * Copyright (C) 2014 Hakim El Hattab, http://hakim.se\n' + + ' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' + ' */' }, diff --git a/LICENSE b/LICENSE index 3866d13..0962307 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2014 Hakim El Hattab, http://hakim.se +Copyright (C) 2015 Hakim El Hattab, http://hakim.se 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 388b4fb..b15f7d5 100644 --- a/README.md +++ b/README.md @@ -947,4 +947,4 @@ Some reveal.js features, like external Markdown and speaker notes, require that MIT licensed -Copyright (C) 2014 Hakim El Hattab, http://hakim.se +Copyright (C) 2015 Hakim El Hattab, http://hakim.se diff --git a/css/reveal.css b/css/reveal.css index 43acebb..05bfd2d 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -3,7 +3,7 @@ * http://lab.hakim.se/reveal-js * MIT licensed * - * Copyright (C) 2014 Hakim El Hattab, http://hakim.se + * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ /********************************************* * RESET STYLES diff --git a/css/reveal.scss b/css/reveal.scss index b731c9b..6cc21ba 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -3,7 +3,7 @@ * http://lab.hakim.se/reveal-js * MIT licensed * - * Copyright (C) 2014 Hakim El Hattab, http://hakim.se + * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ diff --git a/js/reveal.js b/js/reveal.js index 224ce99..4f44c5f 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -3,7 +3,7 @@ * http://lab.hakim.se/reveal-js * MIT licensed * - * Copyright (C) 2014 Hakim El Hattab, http://hakim.se + * Copyright (C) 2015 Hakim El Hattab, http://hakim.se */ (function( root, factory ) { if( typeof define === 'function' && define.amd ) { -- cgit v1.2.3