From 612d0aede928cc0de24c47c4a7014b079ed298e5 Mon Sep 17 00:00:00 2001 From: Alexander Yakovlev Date: Tue, 20 Sep 2016 22:05:09 +0700 Subject: [PATCH] Salet 1.5 - CSS animations --- game/begin.coffee | 2 +- html/index.html | 1 + sass/_variables.scss | 1 + sass/main.scss | 18 ++++++------------ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/game/begin.coffee b/game/begin.coffee index 077c943..3d705ab 100644 --- a/game/begin.coffee +++ b/game/begin.coffee @@ -4,7 +4,7 @@ oneOf = require('../../lib/oneOf.coffee') require('salet') salet.game_id = "your-game-id-here" -salet.game_version = "1.3" +salet.game_version = "1.5" $(document).ready(() -> window.addEventListener('popstate', (event) -> salet.goBack() diff --git a/html/index.html b/html/index.html index 50d697d..e7d8212 100644 --- a/html/index.html +++ b/html/index.html @@ -6,6 +6,7 @@ +
diff --git a/sass/_variables.scss b/sass/_variables.scss index 539c3a5..2d76efc 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -11,3 +11,4 @@ $secondary-bg: #F1EED9; $waycolor: $link-color; $text_background: $body-bg; // can be btn-bg +$animation_duration: 2s; diff --git a/sass/main.scss b/sass/main.scss index 0f53b84..035e09b 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -190,18 +190,12 @@ hr { border-color: $body-color; } -// fade-in animation -@keyframes fadeIn { - from { - opacity: 0; - } - to { - opacity: 1; - } -} - -.fadeIn { - animation-name: fadeIn; +// here we redefine animate.css animation duration, see variables.scss +#ways_hint, ul.options { + -moz-animation-duration: $animation_duration !important; + -webkit-animation-duration: $animation_duration !important; + -o-animation-duration: $animation_duration !important; + animation-duration: $animation_duration !important; } .center {