This commit is contained in:
Mark Otto 2015-01-19 14:55:25 -08:00
parent 7440c38469
commit faedb7fec4
10 changed files with 102 additions and 81 deletions

View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -1763,7 +1763,7 @@ th {
border-bottom-width: 2px;
}
.table-striped tbody tr:nth-child(odd) {
.table-striped tbody tr:nth-of-type(odd) {
background-color: #f9f9f9;
}
@ -1946,6 +1946,7 @@ output {
line-height: 1.5;
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: .25rem;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
@ -2000,7 +2001,7 @@ input[type="search"] {
line-height: 2.025rem;
}
input[type="date"].input-lg, .input-group-lg > input[type="date"].form-control, .input-group-lg > input[type="date"].input-group-addon, .input-group-lg > .input-group-btn > input[type="date"].btn, .input-group-lg input[type="date"], input[type="time"].input-lg, .input-group-lg > input[type="time"].form-control, .input-group-lg > input[type="time"].input-group-addon, .input-group-lg > .input-group-btn > input[type="time"].btn, .input-group-lg input[type="time"], input[type="datetime-local"].input-lg, .input-group-lg > input[type="datetime-local"].form-control, .input-group-lg > input[type="datetime-local"].input-group-addon, .input-group-lg > .input-group-btn > input[type="datetime-local"].btn, .input-group-lg input[type="datetime-local"], input[type="month"].input-lg, .input-group-lg > input[type="month"].form-control, .input-group-lg > input[type="month"].input-group-addon, .input-group-lg > .input-group-btn > input[type="month"].btn, .input-group-lg input[type="month"] {
line-height: 3.3125rem;
line-height: 3.316667rem;
}
}
@ -2099,18 +2100,24 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
.form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control {
height: auto;
}
.form-group-sm .form-control-static {
height: 2.025rem;
padding: .3rem .75rem;
font-size: .85rem;
line-height: 1.5;
}
.input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn {
height: 3.3125rem;
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn {
height: 3.3125rem;
line-height: 3.3125rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn {
@ -2118,19 +2125,25 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
}
.form-group-lg .form-control {
height: 3.3125rem;
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
.form-group-lg select.form-control {
height: 3.3125rem;
line-height: 3.3125rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
.form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control {
height: auto;
}
.form-group-lg .form-control-static {
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.333333;
}
.has-feedback {
position: relative;
@ -2153,9 +2166,9 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
}
.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback {
width: 3.3125rem;
height: 3.3125rem;
line-height: 3.3125rem;
width: 3.316667rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback {
@ -2553,7 +2566,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
.btn-lg, .btn-group-lg > .btn {
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
@ -2618,7 +2631,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
transition-property: height, visibility;
}
.dropdown {
.dropup, .dropdown {
position: relative;
}
@ -2808,12 +2821,12 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
border-radius: 0;
}
.btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child > .dropdown-toggle {
.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.btn-group > .btn-group:last-child > .btn:first-child {
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
@ -4144,7 +4157,6 @@ a.badge:hover, a.badge:focus {
from {
background-position: 1 0;
}
to {
background-position: 0 0;
}
@ -4154,7 +4166,6 @@ a.badge:hover, a.badge:focus {
from {
background-position: 1 0;
}
to {
background-position: 0 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.2 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -9,7 +9,6 @@ if (typeof jQuery === 'undefined') {
}
+function ($) {
'use strict';
var version = $.fn.jquery.split(' ')[0].split('.')
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -1763,7 +1763,7 @@ th {
border-bottom-width: 2px;
}
.table-striped tbody tr:nth-child(odd) {
.table-striped tbody tr:nth-of-type(odd) {
background-color: #f9f9f9;
}
@ -1946,6 +1946,7 @@ output {
line-height: 1.5;
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: .25rem;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
@ -2000,7 +2001,7 @@ input[type="search"] {
line-height: 2.025rem;
}
input[type="date"].input-lg, .input-group-lg > input[type="date"].form-control, .input-group-lg > input[type="date"].input-group-addon, .input-group-lg > .input-group-btn > input[type="date"].btn, .input-group-lg input[type="date"], input[type="time"].input-lg, .input-group-lg > input[type="time"].form-control, .input-group-lg > input[type="time"].input-group-addon, .input-group-lg > .input-group-btn > input[type="time"].btn, .input-group-lg input[type="time"], input[type="datetime-local"].input-lg, .input-group-lg > input[type="datetime-local"].form-control, .input-group-lg > input[type="datetime-local"].input-group-addon, .input-group-lg > .input-group-btn > input[type="datetime-local"].btn, .input-group-lg input[type="datetime-local"], input[type="month"].input-lg, .input-group-lg > input[type="month"].form-control, .input-group-lg > input[type="month"].input-group-addon, .input-group-lg > .input-group-btn > input[type="month"].btn, .input-group-lg input[type="month"] {
line-height: 3.3125rem;
line-height: 3.316667rem;
}
}
@ -2099,18 +2100,24 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
.form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control {
height: auto;
}
.form-group-sm .form-control-static {
height: 2.025rem;
padding: .3rem .75rem;
font-size: .85rem;
line-height: 1.5;
}
.input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn {
height: 3.3125rem;
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn {
height: 3.3125rem;
line-height: 3.3125rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn {
@ -2118,19 +2125,25 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
}
.form-group-lg .form-control {
height: 3.3125rem;
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
.form-group-lg select.form-control {
height: 3.3125rem;
line-height: 3.3125rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
.form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control {
height: auto;
}
.form-group-lg .form-control-static {
height: 3.316667rem;
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.333333;
}
.has-feedback {
position: relative;
@ -2153,9 +2166,9 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
}
.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback {
width: 3.3125rem;
height: 3.3125rem;
line-height: 3.3125rem;
width: 3.316667rem;
height: 3.316667rem;
line-height: 3.316667rem;
}
.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback {
@ -2553,7 +2566,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
.btn-lg, .btn-group-lg > .btn {
padding: .75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.33;
line-height: 1.333333;
border-radius: .3rem;
}
@ -2618,7 +2631,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
transition-property: height, visibility;
}
.dropdown {
.dropup, .dropdown {
position: relative;
}
@ -2808,12 +2821,12 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
border-radius: 0;
}
.btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child > .dropdown-toggle {
.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.btn-group > .btn-group:last-child > .btn:first-child {
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
@ -4144,7 +4157,6 @@ a.badge:hover, a.badge:focus {
from {
background-position: 1 0;
}
to {
background-position: 0 0;
}
@ -4154,7 +4166,6 @@ a.badge:hover, a.badge:focus {
from {
background-position: 1 0;
}
to {
background-position: 0 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Bootstrap v4.0.0-alpha (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@ -16,7 +16,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: transition.js v3.3.1
* Bootstrap: transition.js v3.3.2
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -76,7 +76,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: alert.js v3.3.1
* Bootstrap: alert.js v3.3.2
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -95,7 +95,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close)
}
Alert.VERSION = '3.3.1'
Alert.VERSION = '3.3.2'
Alert.TRANSITION_DURATION = 150
@ -171,7 +171,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: button.js v3.3.1
* Bootstrap: button.js v3.3.2
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -191,7 +191,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false
}
Button.VERSION = '3.3.1'
Button.VERSION = '3.3.2'
Button.DEFAULTS = {
loadingText: 'loading...'
@ -288,7 +288,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: carousel.js v3.3.1
* Bootstrap: carousel.js v3.3.2
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -319,7 +319,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
Carousel.VERSION = '3.3.1'
Carousel.VERSION = '3.3.2'
Carousel.TRANSITION_DURATION = 600
@ -526,7 +526,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: collapse.js v3.3.1
* Bootstrap: collapse.js v3.3.2
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -555,7 +555,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle()
}
Collapse.VERSION = '3.3.1'
Collapse.VERSION = '3.3.2'
Collapse.TRANSITION_DURATION = 350
@ -738,7 +738,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: dropdown.js v3.3.1
* Bootstrap: dropdown.js v3.3.2
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -758,7 +758,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle)
}
Dropdown.VERSION = '3.3.1'
Dropdown.VERSION = '3.3.2'
Dropdown.prototype.toggle = function (e) {
var $this = $(this)
@ -900,7 +900,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: modal.js v3.3.1
* Bootstrap: modal.js v3.3.2
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -931,7 +931,7 @@ if (typeof jQuery === 'undefined') {
}
}
Modal.VERSION = '3.3.1'
Modal.VERSION = '3.3.2'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@ -1225,7 +1225,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: tooltip.js v3.3.1
* Bootstrap: tooltip.js v3.3.2
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@ -1251,7 +1251,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options)
}
Tooltip.VERSION = '3.3.1'
Tooltip.VERSION = '3.3.2'
Tooltip.TRANSITION_DURATION = 150
@ -1572,10 +1572,10 @@ if (typeof jQuery === 'undefined') {
}
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
}
@ -1698,7 +1698,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: popover.js v3.3.1
* Bootstrap: popover.js v3.3.2
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -1718,7 +1718,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.1'
Popover.VERSION = '3.3.2'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
@ -1812,7 +1812,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.1
* Bootstrap: scrollspy.js v3.3.2
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -1843,7 +1843,7 @@ if (typeof jQuery === 'undefined') {
this.process()
}
ScrollSpy.VERSION = '3.3.1'
ScrollSpy.VERSION = '3.3.2'
ScrollSpy.DEFAULTS = {
offset: 10
@ -1988,7 +1988,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: tab.js v3.3.1
* Bootstrap: tab.js v3.3.2
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -2006,7 +2006,7 @@ if (typeof jQuery === 'undefined') {
this.element = $(element)
}
Tab.VERSION = '3.3.1'
Tab.VERSION = '3.3.2'
Tab.TRANSITION_DURATION = 150
@ -2142,7 +2142,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery);
/* ========================================================================
* Bootstrap: affix.js v3.3.1
* Bootstrap: affix.js v3.3.2
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@ -2171,7 +2171,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition()
}
Affix.VERSION = '3.3.1'
Affix.VERSION = '3.3.2'
Affix.RESET = 'affix affix-top affix-bottom'

File diff suppressed because one or more lines are too long