PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 13:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merged development into master

Browse source
This commit is contained in:
NelsonLaQuet 2013-09-01 02:55:25 -05:00
commit 74c8e0997b
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/styles/uploader.less
View file

@ -61,6 +61,7 @@
height: 10px;
z-index: -1;
background: @pfm-purple;
display: none;
}
&.has-error {
@ -71,6 +72,12 @@
}
}
&.uploading {
.bar {
display: block;
}
}
&.is-processing {
border-color: @blue;

2
public/templates/uploader/index.html
View file

@ -4,7 +4,7 @@
</div>
<ul class="uploads">
<li ng-repeat="upload in data.queue" ng-class="{'has-error': upload.error != null, 'is-processing': upload.isUploading && upload.error == null && upload.progress >= 100}" ng-animate="'upload-queue'">
<li ng-repeat="upload in data.queue" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isUploading && upload.error == null && upload.progress >= 100}" ng-animate="'upload-queue'">
<p>
<span ng-show="!upload.success">
<strong ng-show="upload.isUploading && upload.error == null && upload.progress >= 100">Processing</strong>