Merge branch '6.0/inline-edit-autocomplete-cf-dropdown' into 6.0-trunk

cbrandtbuffalo · cbrandtbuffalo · commit 816d7219e79a · 2026-02-05T16:50:19.000-05:00
diff --git a/share/static/css/elevator/inline-edit.css b/share/static/css/elevator/inline-edit.css
@@ -69,14 +69,17 @@ div.editable.loading>form.editor>.cancel {
     display: none;
 }
 
-div.editable.loading>form.editor>.loading {
+/* .spinner-border avoids conflicts with other .loading elements.
+   E.g. TomSelect elements have .loading while a remote search is in progress. */
+
+div.editable.loading>form.editor>.loading.spinner-border {
     display: flex;
     margin-top: 0.5em;
     margin-left: 0.5em;
     padding: 0.5em;
 }
 
-div.editable>form.editor>.loading {
+div.editable>form.editor>.loading.spinner-border {
     display: none;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,17 @@ div.editable.loading>form.editor>.cancel {`
`69`	`69`	`display: none;`
`70`	`70`	`}`
`71`	`71`
`72`		`-div.editable.loading>form.editor>.loading {`
	`72`	`+/* .spinner-border avoids conflicts with other .loading elements.`
	`73`	`+ E.g. TomSelect elements have .loading while a remote search is in progress. */`
	`74`	`+`
	`75`	`+div.editable.loading>form.editor>.loading.spinner-border {`
`73`	`76`	`display: flex;`
`74`	`77`	`margin-top: 0.5em;`
`75`	`78`	`margin-left: 0.5em;`
`76`	`79`	`padding: 0.5em;`
`77`	`80`	`}`
`78`	`81`
`79`		`-div.editable>form.editor>.loading {`
	`82`	`+div.editable>form.editor>.loading.spinner-border {`
`80`	`83`	`display: none;`
`81`	`84`	`}`
`82`	`85`