From 8fd7edb2c827602e49f7202f52112cc8d1ad1cb1 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 25 Jul 2016 17:08:33 +0200 Subject: [PATCH] Add proper scope to files external CSS * for select2 --- apps/files_external/css/settings.css | 10 +++++----- apps/files_external/js/settings.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 6dfb012b15..4d5dc69a4e 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -68,23 +68,23 @@ td.mountPoint, td.backend { width:160px; } padding-left: 25px; } -#body-settings .select2-results .select2-result-label { +.files-external-select2 .select2-results .select2-result-label { height: 32px; padding: 3px; } -.select2-results .select2-result-label > span { +.files-external-select2 .select2-results .select2-result-label > span { display: block; position: relative; } -.select2-results .select2-result-label .avatardiv { +.files-external-select2 .select2-results .select2-result-label .avatardiv { display:inline-block; } -.select2-results .select2-result-label .avatardiv + span { +.files-external-select2 .select2-results .select2-result-label .avatardiv + span { position: absolute; top: 5px; margin-left: 10px; } -.select2-results .select2-result-label .avatardiv[data-type="group"] + span { +.files-external-select2 .select2-results .select2-result-label .avatardiv[data-type="group"] + span { vertical-align: top; top: 6px; position: absolute; diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 921bf92e77..fc6edefc64 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -93,6 +93,7 @@ function addSelect2 ($elements, userListLimit) { placeholder: t('files_external', 'All users. Type to select user or group.'), allowClear: true, multiple: true, + dropdownCssClass: 'files-external-select2', //minimumInputLength: 1, ajax: { url: OC.generateUrl('apps/files_external/applicable'),