Commit d4f1331e authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 149dac0a
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Showing with 42 additions and 53 deletions
+42 -53
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*! /*!
* 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)
*/ */
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
background-color: #e0e0e0; background-color: #e0e0e0;
border-color: #dbdbdb; border-color: #dbdbdb;
} }
.btn-default.disabled,
.btn-default:disabled, .btn-default:disabled,
.btn-default[disabled] { .btn-default[disabled] {
background-color: #e0e0e0; background-color: #e0e0e0;
...@@ -88,6 +89,7 @@ ...@@ -88,6 +89,7 @@
background-color: #265a88; background-color: #265a88;
border-color: #245580; border-color: #245580;
} }
.btn-primary.disabled,
.btn-primary:disabled, .btn-primary:disabled,
.btn-primary[disabled] { .btn-primary[disabled] {
background-color: #265a88; background-color: #265a88;
...@@ -113,6 +115,7 @@ ...@@ -113,6 +115,7 @@
background-color: #419641; background-color: #419641;
border-color: #3e8f3e; border-color: #3e8f3e;
} }
.btn-success.disabled,
.btn-success:disabled, .btn-success:disabled,
.btn-success[disabled] { .btn-success[disabled] {
background-color: #419641; background-color: #419641;
...@@ -138,6 +141,7 @@ ...@@ -138,6 +141,7 @@
background-color: #2aabd2; background-color: #2aabd2;
border-color: #28a4c9; border-color: #28a4c9;
} }
.btn-info.disabled,
.btn-info:disabled, .btn-info:disabled,
.btn-info[disabled] { .btn-info[disabled] {
background-color: #2aabd2; background-color: #2aabd2;
...@@ -163,6 +167,7 @@ ...@@ -163,6 +167,7 @@
background-color: #eb9316; background-color: #eb9316;
border-color: #e38d13; border-color: #e38d13;
} }
.btn-warning.disabled,
.btn-warning:disabled, .btn-warning:disabled,
.btn-warning[disabled] { .btn-warning[disabled] {
background-color: #eb9316; background-color: #eb9316;
...@@ -188,6 +193,7 @@ ...@@ -188,6 +193,7 @@
background-color: #c12e2a; background-color: #c12e2a;
border-color: #b92c28; border-color: #b92c28;
} }
.btn-danger.disabled,
.btn-danger:disabled, .btn-danger:disabled,
.btn-danger[disabled] { .btn-danger[disabled] {
background-color: #c12e2a; background-color: #c12e2a;
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
/*! /*!
* 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)
*/ */
...@@ -901,12 +901,6 @@ th { ...@@ -901,12 +901,6 @@ th {
.glyphicon-paste:before { .glyphicon-paste:before {
content: "\e206"; content: "\e206";
} }
.glyphicon-door:before {
content: "\1f6aa";
}
.glyphicon-key:before {
content: "\1f511";
}
.glyphicon-alert:before { .glyphicon-alert:before {
content: "\e209"; content: "\e209";
} }
......
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.
/*! /*!
* 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)
*/ */
...@@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') { ...@@ -9,6 +9,7 @@ if (typeof jQuery === 'undefined') {
} }
+function ($) { +function ($) {
'use strict';
var version = $.fn.jquery.split(' ')[0].split('.') var version = $.fn.jquery.split(' ')[0].split('.')
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) { 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') throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
...@@ -19,7 +20,7 @@ if (typeof jQuery === 'undefined') { ...@@ -19,7 +20,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: transition.js v3.3.1 * Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -79,7 +80,7 @@ if (typeof jQuery === 'undefined') { ...@@ -79,7 +80,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: alert.js v3.3.1 * Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -174,7 +175,7 @@ if (typeof jQuery === 'undefined') { ...@@ -174,7 +175,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: button.js v3.3.1 * Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -291,7 +292,7 @@ if (typeof jQuery === 'undefined') { ...@@ -291,7 +292,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: carousel.js v3.3.1 * Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -529,7 +530,7 @@ if (typeof jQuery === 'undefined') { ...@@ -529,7 +530,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: collapse.js v3.3.1 * Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -741,7 +742,7 @@ if (typeof jQuery === 'undefined') { ...@@ -741,7 +742,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: dropdown.js v3.3.1 * Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -903,7 +904,7 @@ if (typeof jQuery === 'undefined') { ...@@ -903,7 +904,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: modal.js v3.3.1 * Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -1229,7 +1230,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1229,7 +1230,7 @@ if (typeof jQuery === 'undefined') {
* 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
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -1671,18 +1672,12 @@ if (typeof jQuery === 'undefined') { ...@@ -1671,18 +1672,12 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.tooltip') var data = $this.data('bs.tooltip')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (selector) { if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
if (!data) $this.data('bs.tooltip', (data = {}))
if (!data[selector]) data[selector] = new Tooltip(this, options)
} else {
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
...@@ -1707,7 +1702,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1707,7 +1702,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: popover.js v3.3.1 * Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -1791,18 +1786,12 @@ if (typeof jQuery === 'undefined') { ...@@ -1791,18 +1786,12 @@ if (typeof jQuery === 'undefined') {
function Plugin(option) { function Plugin(option) {
return this.each(function () { return this.each(function () {
var $this = $(this) var $this = $(this)
var data = $this.data('bs.popover') var data = $this.data('bs.popover')
var options = typeof option == 'object' && option var options = typeof option == 'object' && option
var selector = options && options.selector
if (!data && option == 'destroy') return if (!data && option == 'destroy') return
if (selector) { if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
if (!data) $this.data('bs.popover', (data = {}))
if (!data[selector]) data[selector] = new Popover(this, options)
} else {
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
}
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
} }
...@@ -1827,7 +1816,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1827,7 +1816,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: scrollspy.js v3.3.1 * Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -2003,7 +1992,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2003,7 +1992,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: tab.js v3.3.1 * Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
...@@ -2157,7 +2146,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2157,7 +2146,7 @@ if (typeof jQuery === 'undefined') {
* Bootstrap: affix.js v3.3.1 * Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* 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)
* ======================================================================== */ * ======================================================================== */
......
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