Skip to content

B
bootstrap
Commit e4fa95eb authored by Mark Otto's avatar Mark Otto
Browse files
Options

grunt dist

parent 401ace65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 123 deletions
dist/css/bootstrap.css
View file @ e4fa95eb
/*! /*!
* Bootstrap v3.3.1 (http://getbootstrap.com) * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
...@@ -3077,6 +3077,10 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto ...@@ -3077,6 +3077,10 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.c-checkbox input:checked ~ .c-indicator { .c-checkbox input:checked ~ .c-indicator {
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTYuNCwxTDUuNywxLjdMMi45LDQuNUwyLjEsMy43TDEuNCwzTDAsNC40bDAuNywwLjdsMS41LDEuNWwwLjcsMC43bDAuNy0wLjdsMy41LTMuNWwwLjctMC43TDYuNCwxTDYuNCwxeiINCgkvPg0KPC9zdmc+DQo=); background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTYuNCwxTDUuNywxLjdMMi45LDQuNUwyLjEsMy43TDEuNCwzTDAsNC40bDAuNywwLjdsMS41LDEuNWwwLjcsMC43bDAuNy0wLjdsMy41LTMuNWwwLjctMC43TDYuNCwxTDYuNCwxeiINCgkvPg0KPC9zdmc+DQo=);
} }
.c-checkbox input:indeterminate ~ .c-indicator {
background-color: #0074d9;
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOHB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDggOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgOCA4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0wLDN2Mmg4VjNIMHoiLz4NCjwvc3ZnPg0K);
}
.c-radio .c-indicator { .c-radio .c-indicator {
border-radius: 50%; border-radius: 50%;
...@@ -3085,14 +3089,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto ...@@ -3085,14 +3089,6 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQsMUMyLjMsMSwxLDIuMywxLDRzMS4zLDMsMywzczMtMS4zLDMtM1M1LjcsMSw0LDF6Ii8+DQo8L3N2Zz4NCg==); background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQsMUMyLjMsMSwxLDIuMywxLDRzMS4zLDMsMywzczMtMS4zLDMtM1M1LjcsMSw0LDF6Ii8+DQo8L3N2Zz4NCg==);
} }
.control-x input:checked ~ .c-indicator {
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOHB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDggOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgOCA4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xLjQsMEwwLDEuNGwwLjcsMC43bDEuOCwxLjhMMC43LDUuN0wwLDYuNGwxLjQsMS40bDAuNy0wLjdsMS44LTEuOGwxLjgsMS44bDAuNywwLjdsMS40LTEuNEw3LjEsNS43DQoJTDUuMywzLjlsMS44LTEuOGwwLjctMC43TDYuNCwwTDUuNywwLjdMMy45LDIuNUwyLjEsMC43QzIuMSwwLjcsMS40LDAsMS40LDB6Ii8+DQo8L3N2Zz4NCg==);
}
.control-dash input:checked ~ .c-indicator {
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOHB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDggOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgOCA4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0wLDN2Mmg4VjNIMHoiLz4NCjwvc3ZnPg0K);
}
.c-inputs-stacked .c-input { .c-inputs-stacked .c-input {
display: inline; display: inline;
} }
...@@ -4061,13 +4057,6 @@ a.badge:hover, a.badge:focus { ...@@ -4061,13 +4057,6 @@ a.badge:hover, a.badge:focus {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
} }
.alert h4 {
margin-top: 0;
color: inherit;
}
.alert .alert-link {
font-weight: bold;
}
.alert > p, .alert > ul { .alert > p, .alert > ul {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -4075,6 +4064,15 @@ a.badge:hover, a.badge:focus { ...@@ -4075,6 +4064,15 @@ a.badge:hover, a.badge:focus {
margin-top: 5px; margin-top: 5px;
} }
.alert-heading {
margin-top: 0;
color: inherit;
}
.alert-link {
font-weight: bold;
}
.alert-dismissible { .alert-dismissible {
padding-right: 35px; padding-right: 35px;
} }
......
dist/css/bootstrap.css.map
View file @ e4fa95eb
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ e4fa95eb
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/bootstrap.js
View file @ e4fa95eb
/*! /*!
* Bootstrap v3.3.1 (http://getbootstrap.com) * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
...@@ -1403,7 +1403,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1403,7 +1403,7 @@ if (typeof jQuery === 'undefined') {
$tip $tip
.detach() .detach()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.addClass(placement) .addClass(this.type + '-' + placement)
.data('bs.' + this.type, this) .data('bs.' + this.type, this)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
...@@ -1413,7 +1413,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1413,7 +1413,7 @@ if (typeof jQuery === 'undefined') {
var actualHeight = $tip[0].offsetHeight var actualHeight = $tip[0].offsetHeight
if (autoPlace) { if (autoPlace) {
var orgPlacement = placement var origPlacement = placement
var $container = this.options.container ? $(this.options.container) : this.$element.parent() var $container = this.options.container ? $(this.options.container) : this.$element.parent()
var containerDim = this.getPosition($container) var containerDim = this.getPosition($container)
...@@ -1424,8 +1424,8 @@ if (typeof jQuery === 'undefined') { ...@@ -1424,8 +1424,8 @@ if (typeof jQuery === 'undefined') {
placement placement
$tip $tip
.removeClass(orgPlacement) .removeClass(this.type + '-' + origPlacement)
.addClass(placement) .addClass(this.type + '-' + placement)
} }
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
...@@ -1509,7 +1509,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1509,7 +1509,7 @@ if (typeof jQuery === 'undefined') {
var title = this.getTitle() var title = this.getTitle()
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.removeClass('fade in top bottom left right') $tip.removeClass('fade in tooltip-top tooltip-bottom tooltip-left tooltip-right')
} }
Tooltip.prototype.hide = function (callback) { Tooltip.prototype.hide = function (callback) {
...@@ -1730,7 +1730,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1730,7 +1730,7 @@ if (typeof jQuery === 'undefined') {
placement: 'right', placement: 'right',
trigger: 'click', trigger: 'click',
content: '', content: '',
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' template: '<div class="popover" role="tooltip"><div class="popover-arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
}) })
...@@ -1755,7 +1755,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1755,7 +1755,7 @@ if (typeof jQuery === 'undefined') {
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
](content) ](content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade popover-top popover-bottom popover-left popover-right in')
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents. // this manually by checking the contents.
...@@ -1777,7 +1777,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1777,7 +1777,7 @@ if (typeof jQuery === 'undefined') {
} }
Popover.prototype.arrow = function () { Popover.prototype.arrow = function () {
return (this.$arrow = this.$arrow || this.tip().find('.arrow')) return (this.$arrow = this.$arrow || this.tip().find('.popover-arrow'))
} }
Popover.prototype.tip = function () { Popover.prototype.tip = function () {
......
dist/js/bootstrap.min.js
View file @ e4fa95eb
This diff is collapsed.
docs/assets/css/docs.min.css
View file @ e4fa95eb
This diff is collapsed.
docs/assets/css/docs.min.css.map
View file @ e4fa95eb
This diff was suppressed by a .gitattributes entry.
docs/assets/scss/docs.scss
View file @ e4fa95eb
...@@ -110,6 +110,8 @@ body { ...@@ -110,6 +110,8 @@ body {
color: #cdbfe3; color: #cdbfe3;
} }
.bs-docs-nav .navbar-brand { .bs-docs-nav .navbar-brand {
padding-right: .25rem;
padding-left: .25rem;
color: #fff; color: #fff;
} }
.bs-docs-nav .navbar-nav > li > a:hover, .bs-docs-nav .navbar-nav > li > a:hover,
...@@ -629,7 +631,7 @@ body { ...@@ -629,7 +631,7 @@ body {
display: block; display: block;
float: none; float: none;
height: auto; height: auto;
padding: 2rem 1.25rem; padding: 1.75rem 1.25rem;
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
...@@ -952,6 +954,10 @@ body { ...@@ -952,6 +954,10 @@ body {
border-width: .2rem; border-width: .2rem;
} }
+ p {
margin-top: 2rem;
}
// Undo width of container // Undo width of container
.container { .container {
width: auto; width: auto;
......
docs/dist/css/bootstrap.css
View file @ e4fa95eb
This diff is collapsed.
docs/dist/css/bootstrap.css.map
View file @ e4fa95eb
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ e4fa95eb
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/js/bootstrap.js
View file @ e4fa95eb
/*! /*!
* Bootstrap v3.3.1 (http://getbootstrap.com) * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
...@@ -1403,7 +1403,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1403,7 +1403,7 @@ if (typeof jQuery === 'undefined') {
$tip $tip
.detach() .detach()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.addClass(placement) .addClass(this.type + '-' + placement)
.data('bs.' + this.type, this) .data('bs.' + this.type, this)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
...@@ -1413,7 +1413,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1413,7 +1413,7 @@ if (typeof jQuery === 'undefined') {
var actualHeight = $tip[0].offsetHeight var actualHeight = $tip[0].offsetHeight
if (autoPlace) { if (autoPlace) {
var orgPlacement = placement var origPlacement = placement
var $container = this.options.container ? $(this.options.container) : this.$element.parent() var $container = this.options.container ? $(this.options.container) : this.$element.parent()
var containerDim = this.getPosition($container) var containerDim = this.getPosition($container)
...@@ -1424,8 +1424,8 @@ if (typeof jQuery === 'undefined') { ...@@ -1424,8 +1424,8 @@ if (typeof jQuery === 'undefined') {
placement placement
$tip $tip
.removeClass(orgPlacement) .removeClass(this.type + '-' + origPlacement)
.addClass(placement) .addClass(this.type + '-' + placement)
} }
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
...@@ -1509,7 +1509,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1509,7 +1509,7 @@ if (typeof jQuery === 'undefined') {
var title = this.getTitle() var title = this.getTitle()
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.removeClass('fade in top bottom left right') $tip.removeClass('fade in tooltip-top tooltip-bottom tooltip-left tooltip-right')
} }
Tooltip.prototype.hide = function (callback) { Tooltip.prototype.hide = function (callback) {
...@@ -1730,7 +1730,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1730,7 +1730,7 @@ if (typeof jQuery === 'undefined') {
placement: 'right', placement: 'right',
trigger: 'click', trigger: 'click',
content: '', content: '',
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' template: '<div class="popover" role="tooltip"><div class="popover-arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
}) })
...@@ -1755,7 +1755,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1755,7 +1755,7 @@ if (typeof jQuery === 'undefined') {
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
](content) ](content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade popover-top popover-bottom popover-left popover-right in')
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents. // this manually by checking the contents.
...@@ -1777,7 +1777,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1777,7 +1777,7 @@ if (typeof jQuery === 'undefined') {
} }
Popover.prototype.arrow = function () { Popover.prototype.arrow = function () {
return (this.$arrow = this.$arrow || this.tip().find('.arrow')) return (this.$arrow = this.$arrow || this.tip().find('.popover-arrow'))
} }
Popover.prototype.tip = function () { Popover.prototype.tip = function () {
......
docs/dist/js/bootstrap.min.js
View file @ e4fa95eb
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment