Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some additional fixes from a previous loading commit 

Change-Id: I5bdd58fee08c87a8f59b05979d7bddb546fe8187
This commit is contained in:
Nick O'Neill 2014-01-02 12:06:20 -08:00
parent f6f7fb2ff3
commit b8d35b6fe2
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/camlistored/ui/blob_item.css
View File

@ -64,31 +64,6 @@
animation: rightcolors 1.0s infinite ease-in-out;
}
@-webkit-keyframes leftcolors {
0% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
50% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
100% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
}
@-webkit-keyframes rightcolors {
0% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
50% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
100% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
}
@keyframes leftcolors {
0% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
50% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
100% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
}
@keyframes rightcolors {
0% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
50% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
100% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
}
.cam-blobitem-thumb {
display: block;
position: relative;
@ -171,3 +146,29 @@
.cam-blobitem.goog-control-checked .checkmark {
background-image: url('checkmark2_blue.svg');
}
/* keyframes for the loading animation, interpolates between a light and dark grey */
/* see .cam-blobitem-progress above */
@-webkit-keyframes leftcolors {
0% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
50% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
100% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
}
@-webkit-keyframes rightcolors {
0% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
50% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
100% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
}
@keyframes leftcolors {
0% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
50% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
100% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
}
@keyframes rightcolors {
0% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
50% { border-bottom-color: rgb(220,220,220); border-top-color: rgb(220,220,220) }
100% { border-bottom-color: rgb(180,180,180); border-top-color: rgb(180,180,180) }
}

2
server/camlistored/ui/blob_item.js
View File

@ -251,8 +251,6 @@ camlistore.BlobItem.prototype.setThumbSize = function(w, h) {
this.loading_.style.top = Math.round((h - 85) / 2) + 'px';
this.loading_.style.left = Math.round((w - 70) / 2) + 'px';
// this.loading_.style.top
// Load a differently sized image from server if necessary.
if (!this.thumb_.src ||
adjustedWidth > parseInt(this.thumbClip_.style.width) ||