mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2507 from nextcloud/conflict-dialog-ff 

fix conflict dialog styling in firefox
This commit is contained in:
Morris Jobke 2016-12-05 15:19:02 +01:00 committed by GitHub
parent 8adf617726 af9b3e3889
commit b1b4de32b8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/css/upload.css
View File

@ -118,7 +118,7 @@
margin-right: 3px;
}
.oc-dialog .fileexists th:first-child {
width: 230px;
width: 225px;
}
.oc-dialog .fileexists th label {
font-weight: normal;
@ -147,16 +147,14 @@
background-size: 64px 64px;
float: left;
}
.oc-dialog .fileexists .original,
.oc-dialog .fileexists .replacement {
float: left;
width: 230px;
}
.oc-dialog .fileexists .original {
float: left;
width: 230px;
width: 225px;
}
.oc-dialog .fileexists .conflicts {
overflow-y:scroll;
overflow-y: auto;
max-height: 225px;
}
.oc-dialog .fileexists .conflict input[type='checkbox'] {