Skip to content

Commit

Permalink
pace update v0.4.16
Browse files Browse the repository at this point in the history
  • Loading branch information
DanMartinIA committed Jan 2, 2014
1 parent 5bd7bb7 commit 55314d0
Show file tree
Hide file tree
Showing 27 changed files with 36 additions and 48 deletions.
12 changes: 8 additions & 4 deletions app/assets/javascripts/pace/pace.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@
tick = function() {
var diff;
diff = now() - last;
last = now();
return fn(diff, function() {
return requestAnimationFrame(tick);
});
if (diff >= 33) {
last = now();
return fn(diff, function() {
return requestAnimationFrame(tick);
});
} else {
return setTimeout(tick, 33 - diff);
}
};
return tick();
};
Expand Down
Binary file modified app/assets/stylesheets/.DS_Store
Binary file not shown.
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-barber-shop.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -69,4 +68,4 @@
@keyframes pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/pace/pace-theme-big-counter.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
line-height: 1;
text-align: right;
color: rgba(0, 0, 0, 0.19999999999999996);
}
}
1 change: 0 additions & 1 deletion app/assets/stylesheets/pace/pace-theme-bounce.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
width: 140px;
height: 300px;
Expand Down
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-center-circle.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -107,4 +106,4 @@
to {
transform: rotateY(360deg);
}
}
}
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-center-radar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -68,4 +67,4 @@

@keyframes spin {
100% { transform: rotate(359deg); }
}
}
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-corner-indicator.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -67,4 +66,4 @@
@keyframes pace-rotation {
0% { transform: rotate(0deg); }
100% { transform: rotate(359deg); }
}
}
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-fill-left.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand All @@ -19,4 +18,4 @@
-moz-transition: width 1s;
-o-transition: width 1s;
transition: width 1s;
}
}
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-flash.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -78,4 +77,4 @@
@keyframes pace-spinner {
0% { transform: rotate(0deg); transform: rotate(0deg); }
100% { transform: rotate(360deg); transform: rotate(360deg); }
}
}
1 change: 0 additions & 1 deletion app/assets/stylesheets/pace/pace-theme-flat-top.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/pace/pace-theme-loading-bar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/pace/pace-theme-mac-osx.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -55,6 +54,7 @@
-moz-background-size: 28px 100%;
-o-background-size: 28px 100%;
background-size: 28px 100%;

-webkit-animation: pace-stripe-animation 500ms linear infinite;
-moz-animation: pace-stripe-animation 500ms linear infinite;
-ms-animation: pace-stripe-animation 500ms linear infinite;
Expand All @@ -81,4 +81,4 @@
@keyframes pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-28px, 0); transform: translate(-28px, 0); }
}
}
3 changes: 1 addition & 2 deletions app/assets/stylesheets/pace/pace-theme-minimal.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace .pace-progress {
background: #29d;
position: fixed;
Expand All @@ -15,4 +14,4 @@

.pace-inactive {
display: none;
}
}
12 changes: 8 additions & 4 deletions vendor/assets/javascripts/pace/pace.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@
tick = function() {
var diff;
diff = now() - last;
last = now();
return fn(diff, function() {
return requestAnimationFrame(tick);
});
if (diff >= 33) {
last = now();
return fn(diff, function() {
return requestAnimationFrame(tick);
});
} else {
return setTimeout(tick, 33 - diff);
}
};
return tick();
};
Expand Down
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-barber-shop.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -69,4 +68,4 @@
@keyframes pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
}
}
2 changes: 1 addition & 1 deletion vendor/assets/stylesheets/pace/pace-theme-big-counter.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
line-height: 1;
text-align: right;
color: rgba(0, 0, 0, 0.19999999999999996);
}
}
1 change: 0 additions & 1 deletion vendor/assets/stylesheets/pace/pace-theme-bounce.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
width: 140px;
height: 300px;
Expand Down
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-center-circle.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -107,4 +106,4 @@
to {
transform: rotateY(360deg);
}
}
}
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-center-radar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -68,4 +67,4 @@

@keyframes spin {
100% { transform: rotate(359deg); }
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -67,4 +66,4 @@
@keyframes pace-rotation {
0% { transform: rotate(0deg); }
100% { transform: rotate(359deg); }
}
}
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-fill-left.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand All @@ -19,4 +18,4 @@
-moz-transition: width 1s;
-o-transition: width 1s;
transition: width 1s;
}
}
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-flash.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -78,4 +77,4 @@
@keyframes pace-spinner {
0% { transform: rotate(0deg); transform: rotate(0deg); }
100% { transform: rotate(360deg); transform: rotate(360deg); }
}
}
1 change: 0 additions & 1 deletion vendor/assets/stylesheets/pace/pace-theme-flat-top.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down
1 change: 0 additions & 1 deletion vendor/assets/stylesheets/pace/pace-theme-loading-bar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
Expand Down
4 changes: 2 additions & 2 deletions vendor/assets/stylesheets/pace/pace-theme-mac-osx.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace {
-webkit-pointer-events: none;
pointer-events: none;
Expand Down Expand Up @@ -55,6 +54,7 @@
-moz-background-size: 28px 100%;
-o-background-size: 28px 100%;
background-size: 28px 100%;

-webkit-animation: pace-stripe-animation 500ms linear infinite;
-moz-animation: pace-stripe-animation 500ms linear infinite;
-ms-animation: pace-stripe-animation 500ms linear infinite;
Expand All @@ -81,4 +81,4 @@
@keyframes pace-stripe-animation {
0% { transform: none; transform: none; }
100% { transform: translate(-28px, 0); transform: translate(-28px, 0); }
}
}
3 changes: 1 addition & 2 deletions vendor/assets/stylesheets/pace/pace-theme-minimal.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* This is a compiled file, you should be editing the file in the templates directory */
.pace .pace-progress {
background: #29d;
position: fixed;
Expand All @@ -15,4 +14,4 @@

.pace-inactive {
display: none;
}
}

0 comments on commit 55314d0

Please sign in to comment.