Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
mdo committed Jun 1, 2017
1 parent 332d882 commit 6202574
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 325 deletions.
15 changes: 0 additions & 15 deletions dist/css/bootstrap-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.min.css.map

Large diffs are not rendered by default.

19 changes: 2 additions & 17 deletions dist/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css.map

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions dist/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -2981,7 +2981,7 @@ var Tooltip = function ($) {

var Default = {
animation: true,
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<div class="tooltip-inner"></div></div>',
template: '<div class="tooltip" role="tooltip">' + '<div class="arrow"></div>' + '<div class="tooltip-inner"></div></div>',
trigger: 'hover focus',
title: '',
delay: 0,
Expand Down Expand Up @@ -3018,7 +3018,8 @@ var Tooltip = function ($) {

var Selector = {
TOOLTIP: '.tooltip',
TOOLTIP_INNER: '.tooltip-inner'
TOOLTIP_INNER: '.tooltip-inner',
ARROW: '.arrow'
};

var Trigger = {
Expand Down Expand Up @@ -3175,6 +3176,9 @@ var Tooltip = function ($) {
},
flip: {
behavior: this.config.fallbackPlacement
},
arrow: {
element: Selector.ARROW
}
},
onCreate: function onCreate(data) {
Expand Down Expand Up @@ -3621,7 +3625,7 @@ var Popover = function ($) {
placement: 'right',
trigger: 'click',
content: '',
template: '<div class="popover" role="tooltip">' + '<div class="arrow" x-arrow></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
template: '<div class="popover" role="tooltip">' + '<div class="arrow"></div>' + '<h3 class="popover-title"></h3>' + '<div class="popover-content"></div></div>'
});

var DefaultType = $.extend({}, Tooltip.DefaultType, {
Expand Down
Loading

0 comments on commit 6202574

Please sign in to comment.