Commit 0b8a2819 authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 23301b21
Showing with 28 additions and 104 deletions
+28 -104
......@@ -5256,6 +5256,7 @@ a.badge:focus, a.badge:hover {
width: 100%;
height: 1rem;
margin-bottom: 1rem;
overflow: hidden;
}
.progress[value] {
......@@ -5274,35 +5275,19 @@ a.badge:focus, a.badge:hover {
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value="100"]::-moz-progress-bar {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value="100"]::-webkit-progress-value {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: 0.25rem;
}
base::-moz-progress-bar,
.progress[value] {
background-color: #eee;
border-radius: 0.25rem;
}
@media screen and (min-width: 0\0) {
......@@ -5315,12 +5300,6 @@ base::-moz-progress-bar,
height: 1rem;
text-indent: -999rem;
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[width="100%"] {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -4928,6 +4928,7 @@ a.badge:focus, a.badge:hover {
width: 100%;
height: 1rem;
margin-bottom: 1rem;
overflow: hidden;
}
.progress[value] {
......@@ -4946,35 +4947,19 @@ a.badge:focus, a.badge:hover {
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value="100"]::-moz-progress-bar {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value="100"]::-webkit-progress-value {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: 0.25rem;
}
base::-moz-progress-bar,
.progress[value] {
background-color: #eee;
border-radius: 0.25rem;
}
@media screen and (min-width: 0\0) {
......@@ -4987,12 +4972,6 @@ base::-moz-progress-bar,
height: 1rem;
text-indent: -999rem;
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[width="100%"] {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -5,7 +5,7 @@
*/
if (typeof jQuery === 'undefined') {
throw new Error('Bootstrap\'s JavaScript requires jQuery')
throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.')
}
+function ($) {
......@@ -2732,7 +2732,8 @@ var Tooltip = function ($) {
selector: false,
placement: 'top',
offset: '0 0',
constraints: []
constraints: [],
container: false
};
var DefaultType = {
......@@ -2745,7 +2746,8 @@ var Tooltip = function ($) {
selector: '(string|boolean)',
placement: '(string|function)',
offset: 'string',
constraints: 'array'
constraints: 'array',
container: '(string|element|boolean)'
};
var AttachmentMap = {
......@@ -2921,7 +2923,9 @@ var Tooltip = function ($) {
var attachment = this._getAttachment(placement);
$(tip).data(this.constructor.DATA_KEY, this).appendTo(document.body);
var container = this.config.container === false ? document.body : $(this.config.container);
$(tip).data(this.constructor.DATA_KEY, this).appendTo(container);
$(this.element).trigger(this.constructor.Event.INSERTED);
......
This diff is collapsed.
......@@ -5256,6 +5256,7 @@ a.badge:focus, a.badge:hover {
width: 100%;
height: 1rem;
margin-bottom: 1rem;
overflow: hidden;
}
.progress[value] {
......@@ -5274,35 +5275,19 @@ a.badge:focus, a.badge:hover {
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value="100"]::-moz-progress-bar {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value="100"]::-webkit-progress-value {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: 0.25rem;
}
base::-moz-progress-bar,
.progress[value] {
background-color: #eee;
border-radius: 0.25rem;
}
@media screen and (min-width: 0\0) {
......@@ -5315,12 +5300,6 @@ base::-moz-progress-bar,
height: 1rem;
text-indent: -999rem;
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[width="100%"] {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -4928,6 +4928,7 @@ a.badge:focus, a.badge:hover {
width: 100%;
height: 1rem;
margin-bottom: 1rem;
overflow: hidden;
}
.progress[value] {
......@@ -4946,35 +4947,19 @@ a.badge:focus, a.badge:hover {
.progress[value]::-moz-progress-bar {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value]::-webkit-progress-value {
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[value="100"]::-moz-progress-bar {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value="100"]::-webkit-progress-value {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
border-radius: 0.25rem;
}
base::-moz-progress-bar,
.progress[value] {
background-color: #eee;
border-radius: 0.25rem;
}
@media screen and (min-width: 0\0) {
......@@ -4987,12 +4972,6 @@ base::-moz-progress-bar,
height: 1rem;
text-indent: -999rem;
background-color: #0074d9;
border-bottom-left-radius: 0.25rem;
border-top-left-radius: 0.25rem;
}
.progress[width="100%"] {
border-bottom-right-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
}
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -5,7 +5,7 @@
*/
if (typeof jQuery === 'undefined') {
throw new Error('Bootstrap\'s JavaScript requires jQuery')
throw new Error('Bootstrap\'s JavaScript requires jQuery. jQuery must be included before Bootstrap\'s JavaScript.')
}
+function ($) {
......@@ -2732,7 +2732,8 @@ var Tooltip = function ($) {
selector: false,
placement: 'top',
offset: '0 0',
constraints: []
constraints: [],
container: false
};
var DefaultType = {
......@@ -2745,7 +2746,8 @@ var Tooltip = function ($) {
selector: '(string|boolean)',
placement: '(string|function)',
offset: 'string',
constraints: 'array'
constraints: 'array',
container: '(string|element|boolean)'
};
var AttachmentMap = {
......@@ -2921,7 +2923,9 @@ var Tooltip = function ($) {
var attachment = this._getAttachment(placement);
$(tip).data(this.constructor.DATA_KEY, this).appendTo(document.body);
var container = this.config.container === false ? document.body : $(this.config.container);
$(tip).data(this.constructor.DATA_KEY, this).appendTo(container);
$(this.element).trigger(this.constructor.Event.INSERTED);
......
This diff is collapsed.
Supports Markdown
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