Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Greenwich - fix conflict btw bootstrap & jQuery UI button #18696

Merged
merged 1 commit into from
Oct 7, 2020

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Oct 7, 2020

Overview

Fixes a problem in the new Greenwich Bootstrap3 theme causing buttons to disappear.

Before

image

After

image

Technical Details

This calls noConflict on the Bootstrap3 $.fn.button() method, essentially getting rid of it, as it is not used by CiviCRM, whereas the jQuery UI $.fn.button() is used.

If we needed the boostrap button function, we could rename it with something like:
$.fn.btn = $.fn.button.noConflict();

Comments

This file was copied over from Shoreditch, which employs the same fix.

This calls noConflict on the Bootstrap3 $.fn.button() method, essentially getting rid of it,
as it is not used by CiviCRM, whereas the jQuery UI $.fn.button() is used.

If we needed the boostrap button function, we could rename it with something like:
`$.fn.btn = $.fn.button.noConflict();`
@civibot civibot bot added the master label Oct 7, 2020
@civibot
Copy link

civibot bot commented Oct 7, 2020

(Standard links)

@eileenmcnaughton
Copy link
Contributor

unrelated fail

@eileenmcnaughton
Copy link
Contributor

OK - we should get this in 5.31 to go with greenwich

@eileenmcnaughton eileenmcnaughton merged commit f50dbca into civicrm:master Oct 7, 2020
@eileenmcnaughton eileenmcnaughton deleted the btnNoConflict branch October 7, 2020 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants