diff --git a/server/camlistored/ui/blob_item.css b/server/camlistored/ui/blob_item.css index b43bb6499..784dfc8f0 100644 --- a/server/camlistored/ui/blob_item.css +++ b/server/camlistored/ui/blob_item.css @@ -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) } +} diff --git a/server/camlistored/ui/blob_item.js b/server/camlistored/ui/blob_item.js index f42f6aa98..b93cc626d 100644 --- a/server/camlistored/ui/blob_item.js +++ b/server/camlistored/ui/blob_item.js @@ -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) ||