rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

run grunt dist

Browse Source
This commit is contained in:
Mark Otto 2013-12-18 14:26:37 -08:00
parent 0a955844ab
commit 961687e4db
4 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dist/css/bootstrap.css vendored
View File

@ -3762,16 +3762,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: none; display: none;
} }
} }
.navbar-nav { .navbar .nav {
margin: 7.5px -15px; margin: 7.5px -15px;
} }
.navbar-nav > li > a { .navbar .nav > li > a {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
line-height: 20px; line-height: 20px;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-nav .open .dropdown-menu { .navbar .nav .open .dropdown-menu {
position: static; position: static;
float: none; float: none;
width: auto; width: auto;
@ -3780,31 +3780,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
border: 0; border: 0;
box-shadow: none; box-shadow: none;
} }
.navbar-nav .open .dropdown-menu > li > a, .navbar .nav .open .dropdown-menu > li > a,
.navbar-nav .open .dropdown-menu .dropdown-header { .navbar .nav .open .dropdown-menu .dropdown-header {
padding: 5px 15px 5px 25px; padding: 5px 15px 5px 25px;
} }
.navbar-nav .open .dropdown-menu > li > a { .navbar .nav .open .dropdown-menu > li > a {
line-height: 20px; line-height: 20px;
} }
.navbar-nav .open .dropdown-menu > li > a:hover, .navbar .nav .open .dropdown-menu > li > a:hover,
.navbar-nav .open .dropdown-menu > li > a:focus { .navbar .nav .open .dropdown-menu > li > a:focus {
background-image: none; background-image: none;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-nav { .navbar .nav {
float: left; float: left;
margin: 0; margin: 0;
} }
.navbar-nav > li { .navbar .nav > li {
float: left; float: left;
} }
.navbar-nav > li > a { .navbar .nav > li > a {
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
} }
.navbar-nav.navbar-right:last-child { .navbar .nav.navbar-right:last-child {
margin-right: -15px; margin-right: -15px;
} }
} }
@ -4094,7 +4094,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-radius: 4px; border-radius: 4px;
} }
.breadcrumb > li { .breadcrumb > li {
display: inline-block; display: inline;
} }
.breadcrumb > li + li:before { .breadcrumb > li + li:before {
padding: 0 5px; padding: 0 5px;

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

64
dist/js/bootstrap.js vendored
View File

@ -35,10 +35,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
var el = document.createElement('bootstrap') var el = document.createElement('bootstrap')
var transEndEventNames = { var transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd' 'WebkitTransition' : 'webkitTransitionEnd',
, 'MozTransition' : 'transitionend' 'MozTransition' : 'transitionend',
, 'OTransition' : 'oTransitionEnd otransitionend' 'OTransition' : 'oTransitionEnd otransitionend',
, 'transition' : 'transitionend' 'transition' : 'transitionend'
} }
for (var name in transEndEventNames) { for (var name in transEndEventNames) {
@ -319,9 +319,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} }
Carousel.DEFAULTS = { Carousel.DEFAULTS = {
interval: 5000 interval: 5000,
, pause: 'hover' pause: 'hover',
, wrap: true wrap: true
} }
Carousel.prototype.cycle = function (e) { Carousel.prototype.cycle = function (e) {
@ -826,8 +826,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$(document) $(document)
.on('click.bs.dropdown.data-api', clearMenus) .on('click.bs.dropdown.data-api', clearMenus)
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown)
}(jQuery); }(jQuery);
@ -866,9 +866,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} }
Modal.DEFAULTS = { Modal.DEFAULTS = {
backdrop: true backdrop: true,
, keyboard: true keyboard: true,
, show: true show: true
} }
Modal.prototype.toggle = function (_relatedTarget) { Modal.prototype.toggle = function (_relatedTarget) {
@ -1115,15 +1115,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
} }
Tooltip.DEFAULTS = { Tooltip.DEFAULTS = {
animation: true animation: true,
, placement: 'top' placement: 'top',
, selector: false selector: false,
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
, trigger: 'hover focus' trigger: 'hover focus',
, title: '' title: '',
, delay: 0 delay: 0,
, html: false html: false,
, container: false container: false
} }
Tooltip.prototype.init = function (type, element, options) { Tooltip.prototype.init = function (type, element, options) {
@ -1162,8 +1162,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (options.delay && typeof options.delay == 'number') { if (options.delay && typeof options.delay == 'number') {
options.delay = { options.delay = {
show: options.delay show: options.delay,
, hide: options.delay hide: options.delay
} }
} }
@ -1374,8 +1374,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
Tooltip.prototype.getPosition = function () { Tooltip.prototype.getPosition = function () {
var el = this.$element[0] var el = this.$element[0]
return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
width: el.offsetWidth width: el.offsetWidth,
, height: el.offsetHeight height: el.offsetHeight
}, this.$element.offset()) }, this.$element.offset())
} }
@ -1495,11 +1495,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right' placement: 'right',
, trigger: 'click' trigger: 'click',
, content: '' content: '',
, template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
}) })
@ -1796,8 +1796,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
this.activate($this.parent('li'), $ul) this.activate($this.parent('li'), $ul)
this.activate($target, $target.parent(), function () { this.activate($target, $target.parent(), function () {
$this.trigger({ $this.trigger({
type: 'shown.bs.tab' type: 'shown.bs.tab',
, relatedTarget: previous relatedTarget: previous
}) })
}) })
} }