From ba053c042d748a9828911b7316be5fd21ab45e1f Mon Sep 17 00:00:00 2001 From: exane Date: Sat, 4 Jul 2015 16:41:17 +0200 Subject: [PATCH] keyframes fix --- client/scss/_effects.scss | 17 ----------------- client/scss/main.scss | 39 ++++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 36 deletions(-) diff --git a/client/scss/_effects.scss b/client/scss/_effects.scss index 4bdc194..e525f93 100644 --- a/client/scss/_effects.scss +++ b/client/scss/_effects.scss @@ -101,23 +101,6 @@ z-index: 20; } -/*.card { - float: left; - height: 93px; - width: 69px; - position: relative; - transition: margin .05s ease-in-out 0s; -} - -.card i { - display: block; - position: absolute; - top: 3px; - left: 3px; - height: 87px; - z-index: 10; -}*/ - /** SHAME **/ .card-wrap:hover .card-animation, diff --git a/client/scss/main.scss b/client/scss/main.scss index 4afd9ef..19fa097 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -56,22 +56,23 @@ $game-height: 800px; &.active { //box-shadow: 0px 0px 15px #ffbb0b !important; - animation: WoobWoob linear 2s; - animation-iteration-count: infinite; cursor: pointer; -webkit-animation: WoobWoob linear 2s; -webkit-animation-iteration-count: infinite; - -moz-animation: WoobWoob linear 2s; + /*-moz-animation: WoobWoob linear 2s; -moz-animation-iteration-count: infinite; - +*/ -o-animation: WoobWoob linear 2s; -o-animation-iteration-count: infinite; -ms-animation: WoobWoob linear 2s; -ms-animation-iteration-count: infinite; + animation: WoobWoob linear 2s; + animation-iteration-count: infinite; + /*&:hover { box-shadow: 0px 0px 30px #ffd135 !important; }*/ @@ -80,57 +81,57 @@ $game-height: 800px; @-webkit-keyframes WoobWoob { 0% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } 50% { - box-shadow: 0px 0px 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135 !important; } 100% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } } @-moz-keyframes WoobWoob { 0% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } 50% { - box-shadow: 0px 0px 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135 !important; } 100% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } } @-o-keyframes WoobWoob { 0% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } 50% { - box-shadow: 0px 0px 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135 !important; } 100% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } } @-ms-keyframes WoobWoob { 0% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } 50% { - box-shadow: 0px 0px 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135 !important; } 100% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } } @keyframes WoobWoob { 0% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } 50% { - box-shadow: 0px 0px 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135 !important; } 100% { - box-shadow: 0px 0px 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b !important; } }