https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33668
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #45 from David Nind <[email protected]> --- The patches no longer apply 8-(... git bz apply 33668 Bug 33668 - Add a 'clear search' button/icon inside the search input box on the OPAC 176813 - Bug 33668: Add css for the clear button 176814 - Bug 33668: Added clear button to global js 176815 - Bug 33668: (follow-up) Tidy up the code 176816 - Bug 33668: (follow-up) Adjust Font Awesome icon classes 176817 - Bug 33668: (follow-up) Improve the appearance of the 'Clear search' button 176818 - Bug 33668: (follow-up) Modify the JS logic behind the 'Clear search' button 176819 - Bug 33668: (follow-up) Ensure the clear button is added to the DOM only once 188654 - Bug 33668: Add clear search button to the opac Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 33668: Add css for the clear button Applying: Bug 33668: Added clear button to global js Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/js/global.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/global.js CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/js/global.js error: Failed to merge in the changes. Patch failed at 0001 Bug 33668: Added clear button to global js -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
