pacnpal/startbootstrap-clean-blog
1
0
Fork 0
mirror of https://github.com/thewesker/startbootstrap-clean-blog.git synced 2025-12-20 04:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bootstrap 3.3.1 Update

Browse Source
This commit is contained in:
David Miller
2014-12-06 20:44:22 -05:00
parent a2bd65a10e
commit 4d5a4b105c
4 changed files with 157 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
css/bootstrap.css vendored
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.3.0 (http://getbootstrap.com) * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@@ -915,12 +915,12 @@ textarea {
line-height: inherit; line-height: inherit;
} }
a { a {
color: #428bca; color: #337ab7;
text-decoration: none; text-decoration: none;
} }
a:hover, a:hover,
a:focus { a:focus {
color: #2a6496; color: #23527c;
text-decoration: underline; text-decoration: underline;
} }
a:focus { a:focus {
@@ -1153,10 +1153,10 @@ mark,
color: #777; color: #777;
} }
.text-primary { .text-primary {
color: #428bca; color: #337ab7;
} }
a.text-primary:hover { a.text-primary:hover {
color: #3071a9; color: #286090;
} }
.text-success { .text-success {
color: #3c763d; color: #3c763d;
@@ -1184,10 +1184,10 @@ a.text-danger:hover {
} }
.bg-primary { .bg-primary {
color: #fff; color: #fff;
background-color: #428bca; background-color: #337ab7;
} }
a.bg-primary:hover { a.bg-primary:hover {
background-color: #3071a9; background-color: #286090;
} }
.bg-success { .bg-success {
background-color: #dff0d8; background-color: #dff0d8;
@@ -2400,56 +2400,25 @@ textarea.form-control {
input[type="search"] { input[type="search"] {
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
line-height: 34px; input[type="month"] {
line-height: 1.42857143 \0; line-height: 34px;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: 30px; line-height: 30px;
line-height: 1.5 \0; }
} input[type="date"].input-lg,
input[type="date"].input-lg, input[type="time"].input-lg,
input[type="time"].input-lg, input[type="datetime-local"].input-lg,
input[type="datetime-local"].input-lg, input[type="month"].input-lg {
input[type="month"].input-lg { line-height: 46px;
line-height: 46px; }
line-height: 1.33 \0;
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.42857143;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;
@@ -2880,8 +2849,8 @@ fieldset[disabled] .btn-default.active {
} }
.btn-primary { .btn-primary {
color: #fff; color: #fff;
background-color: #428bca; background-color: #337ab7;
border-color: #357ebd; border-color: #2e6da4;
} }
.btn-primary:hover, .btn-primary:hover,
.btn-primary:focus, .btn-primary:focus,
@@ -2890,8 +2859,8 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active, .btn-primary.active,
.open > .dropdown-toggle.btn-primary { .open > .dropdown-toggle.btn-primary {
color: #fff; color: #fff;
background-color: #3071a9; background-color: #286090;
border-color: #285e8e; border-color: #204d74;
} }
.btn-primary:active, .btn-primary:active,
.btn-primary.active, .btn-primary.active,
@@ -2916,11 +2885,11 @@ fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active, .btn-primary.disabled.active,
.btn-primary[disabled].active, .btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active { fieldset[disabled] .btn-primary.active {
background-color: #428bca; background-color: #337ab7;
border-color: #357ebd; border-color: #2e6da4;
} }
.btn-primary .badge { .btn-primary .badge {
color: #428bca; color: #337ab7;
background-color: #fff; background-color: #fff;
} }
.btn-success { .btn-success {
@@ -3105,7 +3074,7 @@ fieldset[disabled] .btn-danger.active {
} }
.btn-link { .btn-link {
font-weight: normal; font-weight: normal;
color: #428bca; color: #337ab7;
border-radius: 0; border-radius: 0;
} }
.btn-link, .btn-link,
@@ -3125,7 +3094,7 @@ fieldset[disabled] .btn-link {
} }
.btn-link:hover, .btn-link:hover,
.btn-link:focus { .btn-link:focus {
color: #2a6496; color: #23527c;
text-decoration: underline; text-decoration: underline;
background-color: transparent; background-color: transparent;
} }
@@ -3274,7 +3243,7 @@ tbody.collapse.in {
.dropdown-menu > .active > a:focus { .dropdown-menu > .active > a:focus {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
background-color: #428bca; background-color: #337ab7;
outline: 0; outline: 0;
} }
.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a,
@@ -3367,10 +3336,6 @@ tbody.collapse.in {
.btn-group-vertical > .btn.active { .btn-group-vertical > .btn.active {
z-index: 2; z-index: 2;
} }
.btn-group > .btn:focus,
.btn-group-vertical > .btn:focus {
outline: 0;
}
.btn-group .btn + .btn, .btn-group .btn + .btn,
.btn-group .btn + .btn-group, .btn-group .btn + .btn-group,
.btn-group .btn-group + .btn, .btn-group .btn-group + .btn,
@@ -3705,7 +3670,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav .open > a:hover, .nav .open > a:hover,
.nav .open > a:focus { .nav .open > a:focus {
background-color: #eee; background-color: #eee;
border-color: #428bca; border-color: #337ab7;
} }
.nav .nav-divider { .nav .nav-divider {
height: 1px; height: 1px;
@@ -3798,7 +3763,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-pills > li.active > a:hover, .nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus { .nav-pills > li.active > a:focus {
color: #fff; color: #fff;
background-color: #428bca; background-color: #337ab7;
} }
.nav-stacked > li { .nav-stacked > li {
float: none; float: none;
@@ -4155,6 +4120,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
@@ -4425,7 +4392,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
padding: 6px 12px; padding: 6px 12px;
margin-left: -1px; margin-left: -1px;
line-height: 1.42857143; line-height: 1.42857143;
color: #428bca; color: #337ab7;
text-decoration: none; text-decoration: none;
background-color: #fff; background-color: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
@@ -4445,7 +4412,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span:hover, .pagination > li > span:hover,
.pagination > li > a:focus, .pagination > li > a:focus,
.pagination > li > span:focus { .pagination > li > span:focus {
color: #2a6496; color: #23527c;
background-color: #eee; background-color: #eee;
border-color: #ddd; border-color: #ddd;
} }
@@ -4458,8 +4425,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
z-index: 2; z-index: 2;
color: #fff; color: #fff;
cursor: default; cursor: default;
background-color: #428bca; background-color: #337ab7;
border-color: #428bca; border-color: #337ab7;
} }
.pagination > .disabled > span, .pagination > .disabled > span,
.pagination > .disabled > span:hover, .pagination > .disabled > span:hover,
@@ -4573,11 +4540,11 @@ a.label:focus {
background-color: #5e5e5e; background-color: #5e5e5e;
} }
.label-primary { .label-primary {
background-color: #428bca; background-color: #337ab7;
} }
.label-primary[href]:hover, .label-primary[href]:hover,
.label-primary[href]:focus { .label-primary[href]:focus {
background-color: #3071a9; background-color: #286090;
} }
.label-success { .label-success {
background-color: #5cb85c; background-color: #5cb85c;
@@ -4638,11 +4605,17 @@ a.badge:focus {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
a.list-group-item.active > .badge, .list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {
color: #428bca; color: #337ab7;
background-color: #fff; background-color: #fff;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge {
margin-left: 3px; margin-left: 3px;
} }
@@ -4675,7 +4648,8 @@ a.list-group-item.active > .badge,
.jumbotron { .jumbotron {
padding: 48px 0; padding: 48px 0;
} }
.container .jumbotron { .container .jumbotron,
.container-fluid .jumbotron {
padding-right: 60px; padding-right: 60px;
padding-left: 60px; padding-left: 60px;
} }
@@ -4704,7 +4678,7 @@ a.list-group-item.active > .badge,
a.thumbnail:hover, a.thumbnail:hover,
a.thumbnail:focus, a.thumbnail:focus,
a.thumbnail.active { a.thumbnail.active {
border-color: #428bca; border-color: #337ab7;
} }
.thumbnail .caption { .thumbnail .caption {
padding: 9px; padding: 9px;
@@ -4826,7 +4800,7 @@ a.thumbnail.active {
line-height: 20px; line-height: 20px;
color: #fff; color: #fff;
text-align: center; text-align: center;
background-color: #428bca; background-color: #337ab7;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-webkit-transition: width .6s ease; -webkit-transition: width .6s ease;
@@ -4934,12 +4908,6 @@ a.thumbnail.active {
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
a.list-group-item { a.list-group-item {
color: #555; color: #555;
} }
@@ -4974,8 +4942,8 @@ a.list-group-item:focus {
.list-group-item.active:focus { .list-group-item.active:focus {
z-index: 2; z-index: 2;
color: #fff; color: #fff;
background-color: #428bca; background-color: #337ab7;
border-color: #428bca; border-color: #337ab7;
} }
.list-group-item.active .list-group-item-heading, .list-group-item.active .list-group-item-heading,
.list-group-item.active:hover .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading,
@@ -4991,7 +4959,7 @@ a.list-group-item:focus {
.list-group-item.active .list-group-item-text, .list-group-item.active .list-group-item-text,
.list-group-item.active:hover .list-group-item-text, .list-group-item.active:hover .list-group-item-text,
.list-group-item.active:focus .list-group-item-text { .list-group-item.active:focus .list-group-item-text {
color: #e1edf7; color: #c7ddef;
} }
.list-group-item-success { .list-group-item-success {
color: #3c763d; color: #3c763d;
@@ -5335,22 +5303,22 @@ a.list-group-item-danger.active:focus {
border-bottom-color: #ddd; border-bottom-color: #ddd;
} }
.panel-primary { .panel-primary {
border-color: #428bca; border-color: #337ab7;
} }
.panel-primary > .panel-heading { .panel-primary > .panel-heading {
color: #fff; color: #fff;
background-color: #428bca; background-color: #337ab7;
border-color: #428bca; border-color: #337ab7;
} }
.panel-primary > .panel-heading + .panel-collapse > .panel-body { .panel-primary > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #428bca; border-top-color: #337ab7;
} }
.panel-primary > .panel-heading .badge { .panel-primary > .panel-heading .badge {
color: #428bca; color: #337ab7;
background-color: #fff; background-color: #fff;
} }
.panel-primary > .panel-footer + .panel-collapse > .panel-body { .panel-primary > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #428bca; border-bottom-color: #337ab7;
} }
.panel-success { .panel-success {
border-color: #d6e9c6; border-color: #d6e9c6;
@@ -5549,10 +5517,9 @@ button.close {
box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
} }
.modal-backdrop { .modal-backdrop {
position: fixed; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0;
left: 0; left: 0;
background-color: #000; background-color: #000;
} }
@@ -5624,7 +5591,9 @@ button.close {
position: absolute; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px; font-size: 12px;
font-weight: normal;
line-height: 1.4; line-height: 1.4;
visibility: visible; visibility: visible;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@@ -5674,14 +5643,16 @@ button.close {
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-left .tooltip-arrow { .tooltip.top-left .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px; margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-right .tooltip-arrow { .tooltip.top-right .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px;
margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
@@ -5708,13 +5679,15 @@ button.close {
} }
.tooltip.bottom-left .tooltip-arrow { .tooltip.bottom-left .tooltip-arrow {
top: 0; top: 0;
left: 5px; right: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
.tooltip.bottom-right .tooltip-arrow { .tooltip.bottom-right .tooltip-arrow {
top: 0; top: 0;
right: 5px; left: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
@@ -5726,6 +5699,7 @@ button.close {
display: none; display: none;
max-width: 276px; max-width: 276px;
padding: 1px; padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: 1.42857143; line-height: 1.42857143;

4
css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

102
js/bootstrap.js vendored
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.3.0 (http://getbootstrap.com) * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@@ -16,7 +16,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.0 * Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -76,7 +76,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.0 * Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -95,7 +95,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.0' Alert.VERSION = '3.3.1'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
@@ -171,7 +171,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.0 * Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -191,7 +191,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.0' Button.VERSION = '3.3.1'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
@@ -282,13 +282,13 @@ if (typeof jQuery === 'undefined') {
e.preventDefault() e.preventDefault()
}) })
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', e.type == 'focus') $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
}) })
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.0 * Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -319,7 +319,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.0' Carousel.VERSION = '3.3.1'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600
@@ -331,6 +331,7 @@ if (typeof jQuery === 'undefined') {
} }
Carousel.prototype.keydown = function (e) { Carousel.prototype.keydown = function (e) {
if (/input|textarea/i.test(e.target.tagName)) return
switch (e.which) { switch (e.which) {
case 37: this.prev(); break case 37: this.prev(); break
case 39: this.next(); break case 39: this.next(); break
@@ -528,7 +529,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.0 * Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -557,7 +558,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.0' Collapse.VERSION = '3.3.1'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350
@@ -740,7 +741,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.0 * Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -760,7 +761,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.0' Dropdown.VERSION = '3.3.1'
Dropdown.prototype.toggle = function (e) { Dropdown.prototype.toggle = function (e) {
var $this = $(this) var $this = $(this)
@@ -796,7 +797,7 @@ if (typeof jQuery === 'undefined') {
} }
Dropdown.prototype.keydown = function (e) { Dropdown.prototype.keydown = function (e) {
if (!/(38|40|27|32)/.test(e.which)) return if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
var $this = $(this) var $this = $(this)
@@ -902,7 +903,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.0 * Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -933,7 +934,7 @@ if (typeof jQuery === 'undefined') {
} }
} }
Modal.VERSION = '3.3.0' Modal.VERSION = '3.3.1'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -959,10 +960,11 @@ if (typeof jQuery === 'undefined') {
this.isShown = true this.isShown = true
this.checkScrollbar() this.checkScrollbar()
this.setScrollbar()
this.$body.addClass('modal-open') this.$body.addClass('modal-open')
this.setScrollbar()
this.escape() this.escape()
this.resize()
this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
@@ -977,6 +979,9 @@ if (typeof jQuery === 'undefined') {
.show() .show()
.scrollTop(0) .scrollTop(0)
if (that.options.backdrop) that.adjustBackdrop()
that.adjustDialog()
if (transition) { if (transition) {
that.$element[0].offsetWidth // force reflow that.$element[0].offsetWidth // force reflow
} }
@@ -1011,6 +1016,7 @@ if (typeof jQuery === 'undefined') {
this.isShown = false this.isShown = false
this.escape() this.escape()
this.resize()
$(document).off('focusin.bs.modal') $(document).off('focusin.bs.modal')
@@ -1046,11 +1052,20 @@ if (typeof jQuery === 'undefined') {
} }
} }
Modal.prototype.resize = function () {
if (this.isShown) {
$(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
} else {
$(window).off('resize.bs.modal')
}
}
Modal.prototype.hideModal = function () { Modal.prototype.hideModal = function () {
var that = this var that = this
this.$element.hide() this.$element.hide()
this.backdrop(function () { this.backdrop(function () {
that.$body.removeClass('modal-open') that.$body.removeClass('modal-open')
that.resetAdjustments()
that.resetScrollbar() that.resetScrollbar()
that.$element.trigger('hidden.bs.modal') that.$element.trigger('hidden.bs.modal')
}) })
@@ -1107,13 +1122,43 @@ if (typeof jQuery === 'undefined') {
} }
} }
// these following methods are used to handle overflowing modals
Modal.prototype.handleUpdate = function () {
if (this.options.backdrop) this.adjustBackdrop()
this.adjustDialog()
}
Modal.prototype.adjustBackdrop = function () {
this.$backdrop
.css('height', 0)
.css('height', this.$element[0].scrollHeight)
}
Modal.prototype.adjustDialog = function () {
var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
this.$element.css({
paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
})
}
Modal.prototype.resetAdjustments = function () {
this.$element.css({
paddingLeft: '',
paddingRight: ''
})
}
Modal.prototype.checkScrollbar = function () { Modal.prototype.checkScrollbar = function () {
this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
this.scrollbarWidth = this.measureScrollbar() this.scrollbarWidth = this.measureScrollbar()
} }
Modal.prototype.setScrollbar = function () { Modal.prototype.setScrollbar = function () {
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
} }
Modal.prototype.resetScrollbar = function () { Modal.prototype.resetScrollbar = function () {
@@ -1121,7 +1166,6 @@ if (typeof jQuery === 'undefined') {
} }
Modal.prototype.measureScrollbar = function () { // thx walsh Modal.prototype.measureScrollbar = function () { // thx walsh
if (document.body.clientWidth >= window.innerWidth) return 0
var scrollDiv = document.createElement('div') var scrollDiv = document.createElement('div')
scrollDiv.className = 'modal-scrollbar-measure' scrollDiv.className = 'modal-scrollbar-measure'
this.$body.append(scrollDiv) this.$body.append(scrollDiv)
@@ -1184,7 +1228,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.0 * Bootstrap: tooltip.js v3.3.1
* http://getbootstrap.com/javascript/#tooltip * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* ======================================================================== * ========================================================================
@@ -1210,7 +1254,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.0' Tooltip.VERSION = '3.3.1'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
@@ -1663,7 +1707,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.0 * Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -1683,7 +1727,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.0' Popover.VERSION = '3.3.1'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',
@@ -1783,7 +1827,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.0 * Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -1814,7 +1858,7 @@ if (typeof jQuery === 'undefined') {
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.0' ScrollSpy.VERSION = '3.3.1'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10
@@ -1959,7 +2003,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.0 * Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -1977,7 +2021,7 @@ if (typeof jQuery === 'undefined') {
this.element = $(element) this.element = $(element)
} }
Tab.VERSION = '3.3.0' Tab.VERSION = '3.3.1'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150
@@ -2113,7 +2157,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.0 * Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
@@ -2142,7 +2186,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.0' Affix.VERSION = '3.3.1'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'

6
js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long