1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Merge branch 'master' of github.com:mperham/sidekiq

This commit is contained in:
Mike Perham 2015-08-03 09:55:55 -07:00
commit 5ffac09941
2 changed files with 24 additions and 61 deletions

View file

@ -227,14 +227,8 @@ var updateRedisStats = function(data) {
} }
var pulseBeacon = function(){ var pulseBeacon = function(){
$beacon = $('.beacon') $('.beacon').addClass('pulse').delay(1000).queue(function(){
$beacon.find('.dot').addClass('pulse').delay(1000).queue(function(){ $(this).removeClass('pulse').dequeue();
$(this).removeClass('pulse');
$(this).dequeue();
});
$beacon.find('.ring').addClass('pulse').delay(1000).queue(function(){
$(this).removeClass('pulse');
$(this).dequeue();
}); });
} }

View file

@ -471,16 +471,22 @@ div.interval-slider input {
.beacon { .beacon {
position: relative; position: relative;
width: 20px;
height: 20px; height: 20px;
display: inline-block; display: inline-block;
} }
.beacon .dot { .beacon .dot,
.beacon .ring {
position: absolute; position: absolute;
top: 5px; top: 50%;
left: 10px; left: 50%;
}
.beacon .dot {
width: 10px; width: 10px;
height: 10px; height: 10px;
margin: -5px 0 0 -5px;
background-color: #80002d; background-color: #80002d;
border-radius: 10px; border-radius: 10px;
box-shadow: 0 0 9px #666; box-shadow: 0 0 9px #666;
@ -490,140 +496,103 @@ div.interval-slider input {
z-index: 10; z-index: 10;
} }
.beacon .dot.pulse { .beacon.pulse .dot {
-webkit-animation: beacon-dot-pulse 1s ease-out; -webkit-animation: beacon-dot-pulse 1s ease-out;
-moz-animation: beacon-dot-pulse 1s ease-out; -moz-animation: beacon-dot-pulse 1s ease-out;
animation: beacon-dot-pulse 1s ease-out; animation: beacon-dot-pulse 1s ease-out;
-webkit-animation-iteration-count: 1;
-moz-animation-iteration-count: 1;
animation-iteration-count: 1;
} }
@-webkit-keyframes beacon-dot-pulse { @-webkit-keyframes beacon-dot-pulse {
from { from {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666; -webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666;
} }
50% { 50% {
background-color: #c90047; background-color: #c90047;
-webkit-box-shadow: 0 0 18px #666; -webkit-box-shadow: 0 0 18px #666;
-moz-box-shadow: 0 0 18px #666;
box-shadow: 0 0 18px #666;
} }
to { to {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666; -webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666;
} }
} }
@-moz-keyframes beacon-dot-pulse { @-moz-keyframes beacon-dot-pulse {
from { from {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666; -moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666;
} }
50% { 50% {
background-color: #c90047; background-color: #c90047;
-webkit-box-shadow: 0 0 18px #666;
-moz-box-shadow: 0 0 18px #666; -moz-box-shadow: 0 0 18px #666;
box-shadow: 0 0 18px #666;
} }
to { to {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666; -moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666;
} }
} }
@keyframes beacon-dot-pulse { @keyframes beacon-dot-pulse {
from { from {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666; box-shadow: 0 0 9px #666;
} }
50% { 50% {
background-color: #c90047; background-color: #c90047;
-webkit-box-shadow: 0 0 18px #666;
-moz-box-shadow: 0 0 18px #666;
box-shadow: 0 0 18px #666; box-shadow: 0 0 18px #666;
} }
to { to {
background-color: #80002d; background-color: #80002d;
-webkit-box-shadow: 0 0 9px #666;
-moz-box-shadow: 0 0 9px #666;
box-shadow: 0 0 9px #666; box-shadow: 0 0 9px #666;
} }
} }
.beacon .ring { .beacon .ring {
position: absolute; width: 28px;
top: 7px; height: 28px;
left: 12px; margin: -14px 0 0 -14px;
width: 0; border-radius: 28px;
height: 0;
border-radius: 3px;
border: 3px solid #80002d; border: 3px solid #80002d;
z-index: 5; z-index: 5;
opacity: 0;
} }
.beacon .ring.pulse { .beacon.pulse .ring {
-webkit-animation: beacon-ring-pulse 1s; -webkit-animation: beacon-ring-pulse 1s;
-moz-animation: beacon-ring-pulse 1s; -moz-animation: beacon-ring-pulse 1s;
animation: beacon-ring-pulse 1s; animation: beacon-ring-pulse 1s;
-webkit-animation-iteration-count: 1;
-moz-animation-iteration-count: 1;
animation-iteration-count: 1;
} }
@-webkit-keyframes beacon-ring-pulse { @-webkit-keyframes beacon-ring-pulse {
0% { 0% {
opacity: 1; opacity: 1;
-webkit-transform: scale(0); -webkit-transform: scale(0.3);
} }
100% { 100% {
opacity: 0; opacity: 0;
border-radius: 15px; -webkit-transform: scale(1);
padding: 8px;
top: 0;
left: 4px;
-webkit-transform: scale(1.5);
} }
} }
@-moz-keyframes beacon-ring-pulse { @-moz-keyframes beacon-ring-pulse {
0% { 0% {
opacity: 1; opacity: 1;
-moz-transform: scale(0); -moz-transform: scale(0.3);
} }
100% { 100% {
opacity: 0; opacity: 0;
border-radius: 15px; -moz-transform: scale(1);
padding: 8px;
top: 2px;
left: 7px;
-moz-transform: scale(1.6);
} }
} }
@keyframes beacon-ring-pulse { @keyframes beacon-ring-pulse {
0% { 0% {
opacity: 1; opacity: 1;
transform: scale(0); transform: scale(0.3);
} }
100% { 100% {
opacity: 0; opacity: 0;
border-radius: 15px; transform: scale(1);
padding: 8px;
top: 0;
left: 5px;
transform: scale(1.5);
} }
} }