diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-30 15:15:38 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-30 15:15:38 +0200 |
commit | eeac6e2ab17bb9bfd94c51e8e026daa25ef3a033 (patch) | |
tree | 8b545a2a5cd7e94c247a2747367648862dae0305 /apps/files | |
parent | 7db9690096f2b78d36acb595ed18e74068e7edde (diff) | |
parent | 97bfc20ac874416dc1de509abc46799da49ba58c (diff) | |
download | nextcloud-server-eeac6e2ab17bb9bfd94c51e8e026daa25ef3a033.tar.gz nextcloud-server-eeac6e2ab17bb9bfd94c51e8e026daa25ef3a033.zip |
Merge pull request #19454 from owncloud/ie8-madness-returns
[IE8] Fix file type sizes and popover menus in file list
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/css/files.css | 3 | ||||
-rw-r--r-- | apps/files/js/mainfileinfodetailview.js | 2 | ||||
-rw-r--r-- | apps/files/js/newfilemenu.js | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 9207a133cdf..1d4d0774482 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -580,6 +580,9 @@ a.action > img { #fileList .popovermenu { margin-right: 21px; } +.ie8 #fileList .popovermenu { + margin-top: -10px; +} .ie8 #fileList a.action img, #fileList tr:hover a.action, diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 39a00d0a5a5..b50e92dea8c 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -131,6 +131,7 @@ } else { // TODO: special icons / shared / external $iconDiv.css('background-image', 'url("' + OC.MimeType.getIconUrl('dir') + '")'); + OC.Util.scaleFixForIE8($iconDiv); } this.$el.find('[title]').tooltip({placement: 'bottom'}); } else { @@ -214,6 +215,7 @@ $iconDiv.css({ 'background-image': 'url("' + $iconDiv.previewImg + '")' }); + OC.Util.scaleFixForIE8($iconDiv); }.bind(this) }); } diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index b07999821d5..0a67aba202b 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -212,6 +212,7 @@ fileType: 'folder' }] })); + OC.Util.scaleFixForIE8(this.$('.svg')); }, /** |