diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-26 08:58:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 08:58:38 +0200 |
| commit | 3b6bba09d47354aa937adac2ba72916622a6d67e (patch) | |
| tree | b92a14b0fdb9e60e97ec349ab8c278efd7e0ba38 | |
| parent | 31e807b1555338e4af44d3f06ab07f5068a39306 (diff) | |
| parent | 8fd7edb2c827602e49f7202f52112cc8d1ad1cb1 (diff) | |
| download | nextcloud-server-3b6bba09d47354aa937adac2ba72916622a6d67e.tar.gz nextcloud-server-3b6bba09d47354aa937adac2ba72916622a6d67e.zip | |
Merge pull request #557 from nextcloud/fix-css-scope-files-external
Add proper scope to files external CSS
| -rw-r--r-- | apps/files_external/css/settings.css | 10 | ||||
| -rw-r--r-- | 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 6dfb012b15e..4d5dc69a4e7 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 921bf92e775..fc6edefc648 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'), |