1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-23 19:36:53 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-07-04 17:33:15 +02:00
commit 610a67b524
2 changed files with 17 additions and 30 deletions

View File

@ -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;
}
}
@-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;
box-shadow: 0 0 15px #ffbb0b;
}
}
@-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;
}
}
@ -209,7 +196,6 @@ $game-height: 800px;
.hand-card {
color: #8798ac;
text-align: center;
padding: 0 20px 0 0 !important;
}
.field-weather {
@ -262,6 +248,7 @@ $game-height: 800px;
div {
margin-bottom: 5px;
padding: 0;
font-size: 17px;
}
.icon-hand-card {
@ -519,11 +506,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;
}

View File

@ -1,7 +1,7 @@
{{#if isWaiting}}
<div class="col-xs-12">
<div class="waiting-for-opponent">
~~ Waiting for opponent ~~
Waiting for opponent
</div>
</div>
{{/if}}