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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34c3a7d
Replace btn-default with btn-secondary
Dec 5, 2016
9a57d6c
Replace .popover('destroy') with .popover('dispose')
Dec 5, 2016
0887687
Add new .popover-arrow class
Dec 5, 2016
1a07d03
Added bootstrap3-specific options next to bootstrap4 counterparts
Dec 14, 2016
57447b0
Revert "Replace .popover('destroy') with .popover('dispose')"
Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/css/bootstrap-tour-standalone.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,7 @@ tbody.collapse.in {
position: fixed;
margin-top: 0;
}
.popover[class*="tour-"].orphan .arrow {
.popover[class*="tour-"].orphan .arrow,
.popover[class*="tour-"].orphan .popover-arrow {
display: none;
}
2 changes: 1 addition & 1 deletion build/css/bootstrap-tour-standalone.min.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion build/css/bootstrap-tour.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
position: fixed;
margin-top: 0;
}
.popover[class*="tour-"].orphan .arrow {
.popover[class*="tour-"].orphan .arrow,
.popover[class*="tour-"].orphan .popover-arrow {
display: none;
}
2 changes: 1 addition & 1 deletion build/css/bootstrap-tour.min.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
* ========================================================================
*/

.tour-backdrop{position:absolute;z-index:1100;background-color:#000;opacity:.8;filter:alpha(opacity=80)}.popover[class*=tour-]{z-index:1102}.popover[class*=tour-] .popover-navigation{padding:9px 14px;overflow:hidden}.popover[class*=tour-] .popover-navigation [data-role=end]{float:right}.popover[class*=tour-] .popover-navigation [data-role=prev],.popover[class*=tour-] .popover-navigation [data-role=next],.popover[class*=tour-] .popover-navigation [data-role=end]{cursor:pointer}.popover[class*=tour-] .popover-navigation [data-role=prev].disabled,.popover[class*=tour-] .popover-navigation [data-role=next].disabled,.popover[class*=tour-] .popover-navigation [data-role=end].disabled{cursor:default}.popover[class*=tour-].orphan{position:fixed;margin-top:0}.popover[class*=tour-].orphan .arrow{display:none}
.tour-backdrop{position:absolute;z-index:1100;background-color:#000;opacity:.8;filter:alpha(opacity=80)}.popover[class*=tour-]{z-index:1102}.popover[class*=tour-] .popover-navigation{padding:9px 14px;overflow:hidden}.popover[class*=tour-] .popover-navigation [data-role=end]{float:right}.popover[class*=tour-] .popover-navigation [data-role=prev],.popover[class*=tour-] .popover-navigation [data-role=next],.popover[class*=tour-] .popover-navigation [data-role=end]{cursor:pointer}.popover[class*=tour-] .popover-navigation [data-role=prev].disabled,.popover[class*=tour-] .popover-navigation [data-role=next].disabled,.popover[class*=tour-] .popover-navigation [data-role=end].disabled{cursor:default}.popover[class*=tour-].orphan{position:fixed;margin-top:0}.popover[class*=tour-].orphan .arrow,.popover[class*=tour-].orphan .popover-arrow{display:none}
2 changes: 1 addition & 1 deletion build/js/bootstrap-tour-standalone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@
duration: false,
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
template: '<div class="popover" role="tooltip"> <div class="arrow popover-arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-secondary" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-secondary" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-secondary" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-secondary" data-role="end">End tour</button> </div> </div>',
afterSetState: function(key, value) {},
afterGetState: function(key, value) {},
afterRemoveState: function(key) {},
Expand Down
6 changes: 5 additions & 1 deletion build/js/bootstrap-tour-standalone.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/bootstrap-tour.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
duration: false,
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
template: '<div class="popover" role="tooltip"> <div class="arrow popover-arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default btn-secondary" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default btn-secondary" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default btn-secondary" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default btn-secondary" data-role="end">End tour</button> </div> </div>',
afterSetState: function(key, value) {},
afterGetState: function(key, value) {},
afterRemoveState: function(key) {},
Expand Down
2 changes: 1 addition & 1 deletion build/js/bootstrap-tour.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/coffee/bootstrap-tour.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
delay: false
basePath: ''
template: '<div class="popover" role="tooltip">
<div class="arrow"></div>
<div class="arrow popover-arrow"></div>
<h3 class="popover-title"></h3>
<div class="popover-content"></div>
<div class="popover-navigation">
<div class="btn-group">
<button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button>
<button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button>
<button class="btn btn-sm btn-default"
<button class="btn btn-sm btn-default btn-secondary" data-role="prev">&laquo; Prev</button>
<button class="btn btn-sm btn-default btn-secondary" data-role="next">Next &raquo;</button>
<button class="btn btn-sm btn-default btn-secondary"
data-role="pause-resume"
data-pause-text="Pause"
data-resume-text="Resume">Pause</button>
</div>
<button class="btn btn-sm btn-default" data-role="end">End tour</button>
<button class="btn btn-sm btn-default btn-secondary" data-role="end">End tour</button>
</div>
</div>'
afterSetState: (key, value) ->
Expand Down
10 changes: 5 additions & 5 deletions src/coffee/bootstrap-tour.spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,15 @@ describe 'Bootstrap Tour', ->
duration: false
delay: false
template: '<div class="popover">
<div class="arrow"></div>
<div class="arrow popover-arrow"></div>
<h3 class="popover-title"></h3>
<div class="popover-content"></div>
<nav class="popover-navigation">
<div class="btn-group">
<button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button>
<button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button>
<button class="btn btn-sm btn-default btn-secondary" data-role="prev">&laquo; Prev</button>
<button class="btn btn-sm btn-default btn-secondary" data-role="next">Next &raquo;</button>
</div>
<button class="btn btn-sm btn-default" data-role="end">End tour</button>
<button class="btn btn-sm btn-default btn-secondary" data-role="end">End tour</button>
</nav>
</div>'
onShow: (tour) ->
Expand Down Expand Up @@ -1061,7 +1061,7 @@ describe 'Bootstrap Tour', ->
@tour = new Tour
template:
'<div class="popover tour">
<div class="arrow"></div>
<div class="arrow popover-arrow"></div>
<h3 class="popover-title"></h3>
<div class="popover-content"></div>
<div class="popover-navigation">
Expand Down
3 changes: 2 additions & 1 deletion src/docs/assets/css/bootstrap-tour.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
position: fixed;
margin-top: 0;
}
.popover[class*="tour-"].orphan .arrow {
.popover[class*="tour-"].orphan .arrow,
.popover[class*="tour-"].orphan .popover-arrow {
display: none;
}
2 changes: 1 addition & 1 deletion src/docs/assets/js/bootstrap-tour.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
duration: false,
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
template: '<div class="popover" role="tooltip"> <div class="arrow popover-arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default btn-secondary" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default btn-secondary" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default btn-secondary" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default btn-secondary" data-role="end">End tour</button> </div> </div>',
afterSetState: function(key, value) {},
afterGetState: function(key, value) {},
afterRemoveState: function(key) {},
Expand Down
3 changes: 2 additions & 1 deletion src/less/bootstrap-tour.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
position: fixed;
margin-top: 0;

.arrow {
.arrow,
.popover-arrow {
display: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/bootstrap-tour.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
duration: false,
delay: false,
basePath: '',
template: '<div class="popover" role="tooltip"> <div class="arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default" data-role="end">End tour</button> </div> </div>',
template: '<div class="popover" role="tooltip"> <div class="arrow popover-arrow"></div> <h3 class="popover-title"></h3> <div class="popover-content"></div> <div class="popover-navigation"> <div class="btn-group"> <button class="btn btn-sm btn-default btn-secondary" data-role="prev">&laquo; Prev</button> <button class="btn btn-sm btn-default btn-secondary" data-role="next">Next &raquo;</button> <button class="btn btn-sm btn-default btn-secondary" data-role="pause-resume" data-pause-text="Pause" data-resume-text="Resume">Pause</button> </div> <button class="btn btn-sm btn-default btn-secondary" data-role="end">End tour</button> </div> </div>',
afterSetState: function(key, value) {},
afterGetState: function(key, value) {},
afterRemoveState: function(key) {},
Expand Down