Merge pull request #557 from nextcloud/fix-css-scope-files-external

MorrisJobke · web-flow · commit 3b6bba09d473 · 2016-07-26T08:58:38.000+02:00
Add proper scope to files external CSS
diff --git 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
@@ -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'),

Original file line number	Diff line number	Diff line change
`@@ -68,23 +68,23 @@ td.mountPoint, td.backend { width:160px; }`
`68`	`68`	`padding-left: 25px;`
`69`	`69`	`}`
`70`	`70`
`71`		`-#body-settings .select2-results .select2-result-label {`
	`71`	`+.files-external-select2 .select2-results .select2-result-label {`
`72`	`72`	`height: 32px;`
`73`	`73`	`padding: 3px;`
`74`	`74`	`}`
`75`		`-.select2-results .select2-result-label > span {`
	`75`	`+.files-external-select2 .select2-results .select2-result-label > span {`
`76`	`76`	`display: block;`
`77`	`77`	`position: relative;`
`78`	`78`	`}`
`79`		`-.select2-results .select2-result-label .avatardiv {`
	`79`	`+.files-external-select2 .select2-results .select2-result-label .avatardiv {`
`80`	`80`	`display:inline-block;`
`81`	`81`	`}`
`82`		`-.select2-results .select2-result-label .avatardiv + span {`
	`82`	`+.files-external-select2 .select2-results .select2-result-label .avatardiv + span {`
`83`	`83`	`position: absolute;`
`84`	`84`	`top: 5px;`
`85`	`85`	`margin-left: 10px;`
`86`	`86`	`}`
`87`		`-.select2-results .select2-result-label .avatardiv[data-type="group"] + span {`
	`87`	`+.files-external-select2 .select2-results .select2-result-label .avatardiv[data-type="group"] + span {`
`88`	`88`	`vertical-align: top;`
`89`	`89`	`top: 6px;`
`90`	`90`	`position: absolute;`