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:08:12 +02:00
commit 2d1fb7056e
2 changed files with 26 additions and 12 deletions

View File

@ -740,7 +740,7 @@ let User = Backbone.Model.extend({
app.receive("foe:left", function(){
//console.log("your foe left the room");
$(".container").prepend('<div class="alert alert-danger">Your foe left the battle!</div>')
$(".container").prepend('<div class="notification-left">Your foe left the battle!</div>')
})
app.receive("played:medic", function(data){

View File

@ -523,24 +523,38 @@ $game-height: 800px;
background: #444ba1;
}
.waiting-for-opponent{
animation: waitForOpponent linear 2s;
.waiting-for-opponent,
.notification-left {
animation: Woob linear 2s;
animation-iteration-count: infinite;
transform-origin: 50% 50%;
-webkit-animation: waitForOpponent linear 2s;
-webkit-animation: Woob linear 2s;
-webkit-animation-iteration-count: infinite;
-webkit-transform-origin: 50% 50%;
-moz-animation: waitForOpponent linear 2s;
-moz-animation: Woob linear 2s;
-moz-animation-iteration-count: infinite;
-moz-transform-origin: 50% 50%;
-o-animation: waitForOpponent linear 2s;
-o-animation: Woob linear 2s;
-o-animation-iteration-count: infinite;
-o-transform-origin: 50% 50%;
-ms-animation: waitForOpponent linear 2s;
-ms-animation: Woob linear 2s;
-ms-animation-iteration-count: infinite;
-ms-transform-origin: 50% 50%;
}
.notification-left {
background: #c64b4b;
color: #fff;
left: 0;
padding: 10px 0;
position: fixed;
top: 0;
width: 100%;
z-index: 20;
text-align: center;
font-size: 17px;
}
.container {
position: relative;
}
@ -582,7 +596,7 @@ $game-height: 800px;
}
@keyframes waitForOpponent{
@keyframes Woob{
0% {
opacity:1;
}
@ -594,7 +608,7 @@ $game-height: 800px;
}
}
@-moz-keyframes waitForOpponent{
@-moz-keyframes Woob{
0% {
opacity:1;
}
@ -606,7 +620,7 @@ $game-height: 800px;
}
}
@-webkit-keyframes waitForOpponent {
@-webkit-keyframes Woob {
0% {
opacity:1;
}
@ -618,7 +632,7 @@ $game-height: 800px;
}
}
@-o-keyframes waitForOpponent {
@-o-keyframes Woob {
0% {
opacity:1;
}
@ -630,7 +644,7 @@ $game-height: 800px;
}
}
@-ms-keyframes waitForOpponent {
@-ms-keyframes Woob {
0% {
opacity:1;
}