summaryrefslogtreecommitdiffstats
path: root/apps/files/css
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-09-10 17:34:28 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-09-10 17:34:28 +0200
commit2c9b3d32efa466b655a7f24c5022a42045ef482f (patch)
tree6490b25ee145164c78008f2ff62274b80fe1779f /apps/files/css
parentcec932f29252da7d47ddcbb33003ba11252d5753 (diff)
downloadnextcloud-server-2c9b3d32efa466b655a7f24c5022a42045ef482f.tar.gz
nextcloud-server-2c9b3d32efa466b655a7f24c5022a42045ef482f.zip
unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack
Diffstat (limited to 'apps/files/css')
-rw-r--r--apps/files/css/files.css11
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e503674e0fc..06088b30fff 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -348,7 +348,7 @@ table.dragshadow td.size {
margin-right: 3px;
}
.oc-dialog .fileexists th:first-child {
- width: 235px;
+ width: 230px;
}
.oc-dialog .fileexists th label {
font-weight: normal;
@@ -367,6 +367,7 @@ table.dragshadow td.size {
.oc-dialog .fileexists .conflict .filename {
color:#777;
word-break: break-all;
+ clear: left;
}
.oc-dialog .fileexists .icon {
width: 64px;
@@ -379,15 +380,11 @@ table.dragshadow td.size {
.oc-dialog .fileexists .replacement {
float: left;
- width: 235px;
+ width: 230px;
}
.oc-dialog .fileexists .original {
float: left;
- width: 235px;
-}
-html.lte9 .oc-dialog .fileexists .original {
- float: left;
- width: 225px;
+ width: 230px;
}
.oc-dialog .fileexists .conflicts {
overflow-y:scroll;