From bf4efd52909d91965d346df35d975ffb1fa35269 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 18 Aug 2013 11:18:16 +0200 Subject: move upload progress bar near upload button, more contextual --- apps/files/css/files.css | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'apps/files') diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 50aa58b53d7..2cc68fd3bbf 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 { + position: relative; + display: inline; +} #uploadprogresswrapper #uploadprogressbar { - position:relative; float: right; - margin-left: 12px; width:10em; height:1.5em; top:.4em; + position:relative; + float: left; + margin-left: 12px; + width: 130px; + height: 26px; display:inline-block; } +#uploadprogresswrapper #uploadprogressbar + stop { + font-size: 13px; +} + /* FILE TABLE */ -- cgit v1.2.3 From dce7cdaaec8b69b32d68fa7d4cdb6c0a3ca34f94 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 18 Aug 2013 11:27:51 +0200 Subject: remove unneeded extra ID selectors --- apps/files/css/files.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files') diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 2cc68fd3bbf..a2cf8398c27 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -50,7 +50,7 @@ position: relative; display: inline; } -#uploadprogresswrapper #uploadprogressbar { +#uploadprogressbar { position:relative; float: left; margin-left: 12px; @@ -58,7 +58,7 @@ height: 26px; display:inline-block; } -#uploadprogresswrapper #uploadprogressbar + stop { +#uploadprogressbar + stop { font-size: 13px; } -- cgit v1.2.3