diff options
| author | Christopher <kondou@ts.unde.re> | 2013-08-18 09:30:47 -0700 |
|---|---|---|
| committer | Christopher <kondou@ts.unde.re> | 2013-08-18 09:30:47 -0700 |
| commit | c620c5840ab8ca45531c7639e086bafbd87d7365 (patch) | |
| tree | 1f8e4f356268df005371b2de74a73891245a872b /apps/files | |
| parent | c7af26ec84f2aecc8198f9a3a080950e89e5ec10 (diff) | |
| parent | dce7cdaaec8b69b32d68fa7d4cdb6c0a3ca34f94 (diff) | |
| download | nextcloud-server-c620c5840ab8ca45531c7639e086bafbd87d7365.tar.gz nextcloud-server-c620c5840ab8ca45531c7639e086bafbd87d7365.zip | |
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
move upload progress bar near upload button, more contextual
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/css/files.css | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 50aa58b53d7..a2cf8398c27 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -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 */ |