Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton

move upload progress bar near upload button, more contextual
This commit is contained in:
Christopher 2013-08-18 09:30:47 -07:00
commit c620c5840a
1 changed files with 14 additions and 4 deletions

View File

@ -46,12 +46,22 @@
z-index:20; position:relative; cursor:pointer; overflow:hidden;
}
#uploadprogresswrapper { float: right; position: relative; }
#uploadprogresswrapper #uploadprogressbar {
position:relative; float: right;
margin-left: 12px; width:10em; height:1.5em; top:.4em;
#uploadprogresswrapper {
position: relative;
display: inline;
}
#uploadprogressbar {
position:relative;
float: left;
margin-left: 12px;
width: 130px;
height: 26px;
display:inline-block;
}
#uploadprogressbar + stop {
font-size: 13px;
}
/* FILE TABLE */