diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
commit | 54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7 (patch) | |
tree | 48c2eb0ad04a4bd921f223258e41beba2e2c6539 /apps/files/css/files.css | |
parent | 9c83b307f6d49f30c4cc6db7258d7e3851bac0b7 (diff) | |
parent | 00a30e665128352e9b20268ea65400a968903c74 (diff) | |
download | nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.tar.gz nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.zip |
fix merge conflict
Diffstat (limited to 'apps/files/css/files.css')
-rw-r--r-- | apps/files/css/files.css | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f3376458456..ced2006ec06 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -106,7 +106,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */ background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9); } -#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */ +#fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */ background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9); } #fileList .fileactions a.action img { position:relative; top:.2em; } @@ -125,3 +125,22 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } #scanning-message{ top:40%; left:40%; position:absolute; display:none; } div.crumb a{ padding:0.9em 0 0.7em 0; } + +table.dragshadow { + width:auto; +} +table.dragshadow td.filename { + padding-left:36px; + padding-right:16px; +} +table.dragshadow td.size { + padding-right:8px; +} +#upgrade { + width: 400px; + position: absolute; + top: 200px; + left: 50%; + text-align: center; + margin-left: -200px; +} |