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.

Sign up for GitHub

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

Jump to bottom

Ongoing fix for issue #554, Bootstrap 4 compliance #602

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ongoing fix for issue #554, Bootstrap 4 compliance #602

wants to merge 5 commits into from

Commits on Dec 5, 2016

  1. Replace btn-default with btn-secondary

    Armand ACCROMBESSI committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    34c3a7d View commit details
    Browse the repository at this point in the history

  2. Replace .popover('destroy') with .popover('dispose')

    Armand ACCROMBESSI committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    9a57d6c View commit details
    Browse the repository at this point in the history

  3. Add new .popover-arrow class

    Armand ACCROMBESSI committed Dec 5, 2016
    Configuration menu
    Copy the full SHA
    0887687 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Added bootstrap3-specific options next to bootstrap4 counterparts

    Armand ACCROMBESSI committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    1a07d03 View commit details
    Browse the repository at this point in the history

  2. Revert "Replace .popover('destroy') with .popover('dispose')" 

    This reverts commit 9a57d6c.

Conflicts:
	build/js/bootstrap-tour-standalone.min.js
	build/js/bootstrap-tour.js
	build/js/bootstrap-tour.min.js
	src/coffee/bootstrap-tour.coffee
	src/coffee/bootstrap-tour.spec.coffee
	src/docs/assets/js/bootstrap-tour.js
	test/bootstrap-tour.js
    Armand ACCROMBESSI committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    57447b0 View commit details
    Browse the repository at this point in the history