diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-05 17:27:09 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-05 17:27:09 +0100 |
| commit | e0de0a122f477d1e445f4f36c85c7462c5c66eb1 (patch) | |
| tree | 660c1f119d7db105b28971c44b49401ecfdfacc2 /core | |
| parent | 934d08b2e8b0f6f8616882b9c08d1bec4db22eb2 (diff) | |
| download | nextcloud-server-e0de0a122f477d1e445f4f36c85c7462c5c66eb1.tar.gz nextcloud-server-e0de0a122f477d1e445f4f36c85c7462c5c66eb1.zip | |
Disable grid for ie
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.scss | 1 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/css/styles.scss b/core/css/styles.scss index f23f4c2dead..9b7da393698 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -196,6 +196,7 @@ body { display: flex; height: 36px; width: 36px; + padding: 9px; // width - border - icon width = 18px align-items: center; justify-content: center; } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 5231a94f333..dee74502a6f 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -236,12 +236,20 @@ var OCdialogs = { multiselect = false; } + // No grid for IE! + if (OC.Util.isIE()) { + self.$filePicker.find('#picker-view-toggle').remove(); + self.$filePicker.find('#filestable').removeClass('view-grid'); + } + $('body').append(self.$filePicker); self.$showGridView = $('input#picker-showgridview'); self.$showGridView.on('change', _.bind(self._onGridviewChange, self)); - self._getGridSettings(); + if (!OC.Util.isIE()) { + self._getGridSettings(); + } self.$filePicker.ready(function() { self.$filelist = self.$filePicker.find('.filelist tbody'); |