From f599034457b69b9816f9cfa6f3ec6cf630216b51 Mon Sep 17 00:00:00 2001 From: devfake Date: Sat, 4 Jul 2015 17:13:43 +0200 Subject: [PATCH 1/2] fix for ff --- client/scss/main.scss | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/client/scss/main.scss b/client/scss/main.scss index e84d1b5..2b3713b 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -62,9 +62,6 @@ $game-height: 800px; -webkit-animation: WoobWoob linear 2s; -webkit-animation-iteration-count: infinite; - /*-moz-animation: WoobWoob linear 2s; - -moz-animation-iteration-count: infinite; -*/ -o-animation: WoobWoob linear 2s; -o-animation-iteration-count: infinite; @@ -82,57 +79,47 @@ $game-height: 800px; @-webkit-keyframes WoobWoob { 0% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } 50% { - box-shadow: 0 0 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135; } 100% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } } -@-moz-keyframes WoobWoob { - 0% { - box-shadow: 0 0 15px #ffbb0b !important; - } - 50% { - box-shadow: 0 0 40px #ffd135 !important; - } - 100% { - box-shadow: 0 0 15px #ffbb0b !important; - } - } + @-o-keyframes WoobWoob { 0% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } 50% { - box-shadow: 0 0 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135; } 100% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } } @-ms-keyframes WoobWoob { 0% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } 50% { - box-shadow: 0 0 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135; } 100% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } } @keyframes WoobWoob { 0% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } 50% { - box-shadow: 0 0 40px #ffd135 !important; + box-shadow: 0 0 40px #ffd135; } 100% { - box-shadow: 0 0 15px #ffbb0b !important; + box-shadow: 0 0 15px #ffbb0b; } } @@ -204,7 +191,6 @@ $game-height: 800px; .hand-card { color: #8798ac; text-align: center; - padding: 0 20px 0 0 !important; } .field-weather { @@ -257,6 +243,7 @@ $game-height: 800px; div { margin-bottom: 5px; padding: 0; + font-size: 17px; } .icon-hand-card { From 964f02c90d1ed48fe76163e223dc137a19029af0 Mon Sep 17 00:00:00 2001 From: devfake Date: Sat, 4 Jul 2015 17:29:23 +0200 Subject: [PATCH 2/2] style waiting --- client/scss/main.scss | 4 ++-- client/templates/battle.handlebars | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/scss/main.scss b/client/scss/main.scss index 2b3713b..9cbd032 100644 --- a/client/scss/main.scss +++ b/client/scss/main.scss @@ -501,11 +501,11 @@ $game-height: 800px; //border-radius: 10px; /* padding: 0px 200px;*/ - font-size: 25px; + font-size: 19px; line-height: 15px; padding: 15px; z-index: 300; - color: #ff8927; + color: #dfe1fd; //text-shadow: 0px 0px 1px #000; background: #444ba1; } diff --git a/client/templates/battle.handlebars b/client/templates/battle.handlebars index 91dfbc7..2b03256 100644 --- a/client/templates/battle.handlebars +++ b/client/templates/battle.handlebars @@ -1,7 +1,7 @@ {{#if isWaiting}}
- ~~ Waiting for opponent ~~ + Waiting for opponent
{{/if}}