diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-19 11:24:17 +0200 |
| commit | f2702ff1ca45d72300eed5dfa58ebc19aa6e9910 (patch) | |
| tree | b1424be17877cbd25bf3781600d353efd3dd0759 /apps/files/css | |
| parent | 7e4dcd268f6cb6618600718a51c4d882e9027829 (diff) | |
| parent | 9be836814cb4165ea54a086a0f97526d783bcd37 (diff) | |
| download | nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.tar.gz nextcloud-server-f2702ff1ca45d72300eed5dfa58ebc19aa6e9910.zip | |
Merge master into oc_preview
Diffstat (limited to 'apps/files/css')
| -rw-r--r-- | apps/files/css/files.css | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index be42a0056d8..b94d6fbcbe8 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -49,12 +49,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 */ @@ -275,14 +285,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } display:none; } #fileList tr:hover a.action, #fileList a.action.permanent { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)"; - filter: alpha(opacity=.5); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); opacity: .5; display:inline; } #fileList tr:hover a.action:hover { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; - filter: alpha(opacity=1); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); opacity: 1; display:inline; } |