From 1d32f1c1feafc98b27c56ddc23d9c279eaae223a Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Tue, 18 Jun 2013 20:37:20 -0700 Subject: [PATCH] updated bootstrap to v2.3.2 --- UI/Content/Bootstrap/pager.less | 15 +++------ UI/Content/Bootstrap/pagination.less | 2 +- UI/Content/Bootstrap/reset.less | 27 ++++++---------- UI/JsLibraries/bootstrap.js | 46 ++++++++++++++++++---------- 4 files changed, 44 insertions(+), 46 deletions(-) diff --git a/UI/Content/Bootstrap/pager.less b/UI/Content/Bootstrap/pager.less index 2c0910c6b..147618829 100644 --- a/UI/Content/Bootstrap/pager.less +++ b/UI/Content/Bootstrap/pager.less @@ -2,47 +2,42 @@ // Pager pagination // -------------------------------------------------- + .pager { margin: @baseLineHeight 0; list-style: none; text-align: center; .clearfix(); } - .pager li { display: inline; } - .pager li > a, .pager li > span { display: inline-block; padding: 5px 14px; - background-color: #FFFFFF; - border: 1px solid #DDDDDD; + background-color: #fff; + border: 1px solid #ddd; .border-radius(15px); } - .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #F5F5F5; + background-color: #f5f5f5; } - .pager .next > a, .pager .next > span { float: right; } - .pager .previous > a, .pager .previous > span { float: left; } - .pager .disabled > a, .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { color: @grayLight; - background-color: #FFFFFF; + background-color: #fff; cursor: default; } \ No newline at end of file diff --git a/UI/Content/Bootstrap/pagination.less b/UI/Content/Bootstrap/pagination.less index 802213c31..a789db2d2 100644 --- a/UI/Content/Bootstrap/pagination.less +++ b/UI/Content/Bootstrap/pagination.less @@ -4,7 +4,7 @@ // Space out pagination from surrounding content .pagination { -// margin: @baseLineHeight 0; + margin: @baseLineHeight 0; } .pagination ul { diff --git a/UI/Content/Bootstrap/reset.less b/UI/Content/Bootstrap/reset.less index 4cf0859d7..4806bd5e5 100644 --- a/UI/Content/Bootstrap/reset.less +++ b/UI/Content/Bootstrap/reset.less @@ -3,6 +3,7 @@ // Adapted from http://github.com/necolas/normalize.css // -------------------------------------------------- + // Display in IE6-9 and FF3 // ------------------------- @@ -34,7 +35,7 @@ video { // ------------------------- audio:not([controls]) { - display: none; + display: none; } // Base settings @@ -43,14 +44,12 @@ audio:not([controls]) { html { font-size: 100%; -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; } - // Focus states a:focus { .tab-focus(); } - // Hover & Active a:hover, a:active { @@ -67,11 +66,9 @@ sup { line-height: 0; vertical-align: baseline; } - sup { top: -0.5em; } - sub { bottom: -0.25em; } @@ -108,27 +105,23 @@ textarea { font-size: 100%; vertical-align: middle; } - button, input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } - button::-moz-focus-inner, input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } - button, html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. input[type="reset"], input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. } - label, select, button, @@ -137,24 +130,22 @@ input[type="reset"], input[type="submit"], input[type="radio"], input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. } - input[type="search"] { // Appearance in Safari/Chrome .box-sizing(content-box); -webkit-appearance: textfield; } - input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } - textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } + // Printing // ------------------------- // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css @@ -163,7 +154,7 @@ textarea { * { text-shadow: none !important; - color: #000000 !important; // Black prints faster: h5bp.com/s + color: #000 !important; // Black prints faster: h5bp.com/s background: transparent !important; box-shadow: none !important; } @@ -190,7 +181,7 @@ textarea { pre, blockquote { - border: 1px solid #999999; + border: 1px solid #999; page-break-inside: avoid; } diff --git a/UI/JsLibraries/bootstrap.js b/UI/JsLibraries/bootstrap.js index a81171b42..643e71cdf 100644 --- a/UI/JsLibraries/bootstrap.js +++ b/UI/JsLibraries/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.3.0 + * bootstrap-transition.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -58,7 +58,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.3.0 + * bootstrap-alert.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -156,7 +156,7 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.3.0 + * bootstrap-button.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -260,7 +260,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.3.0 + * bootstrap-carousel.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -336,7 +336,7 @@ if (!e) this.paused = true if (this.$element.find('.next, .prev').length && $.support.transition.end) { this.$element.trigger($.support.transition.end) - this.cycle() + this.cycle(true) } clearInterval(this.interval) this.interval = null @@ -466,7 +466,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.3.0 + * bootstrap-collapse.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -632,7 +632,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.3.0 + * bootstrap-dropdown.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -685,6 +685,10 @@ clearMenus() if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $('
').insertBefore($(this)).on('click', clearMenus) + } $parent.toggleClass('open') } @@ -737,6 +741,7 @@ } function clearMenus() { + $('.dropdown-backdrop').remove() $(toggle).each(function () { getParent($(this)).removeClass('open') }) @@ -791,13 +796,12 @@ $(document) .on('click.dropdown.data-api', clearMenus) .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('.dropdown-menu', function (e) { e.stopPropagation() }) .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery); /* ========================================================= - * bootstrap-modal.js v2.3.0 + * bootstrap-modal.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -946,7 +950,7 @@ } , removeBackdrop: function () { - this.$backdrop.remove() + this.$backdrop && this.$backdrop.remove() this.$backdrop = null } @@ -1044,7 +1048,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-tooltip.js v2.3.0 + * bootstrap-tooltip.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -1125,7 +1129,15 @@ } , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) + var defaults = $.fn[this.type].defaults + , options = {} + , self + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }, this) + + self = $(e.currentTarget)[this.type](options).data(this.type) if (!self.options.delay || !self.options.delay.show) return self.show() @@ -1397,7 +1409,7 @@ }(window.jQuery); /* =========================================================== - * bootstrap-popover.js v2.3.0 + * bootstrap-popover.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1511,7 +1523,7 @@ }(window.jQuery); /* ============================================================= - * bootstrap-scrollspy.js v2.3.0 + * bootstrap-scrollspy.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1672,7 +1684,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.3.0 + * bootstrap-tab.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1815,7 +1827,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.3.0 + * bootstrap-typeahead.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -2150,7 +2162,7 @@ }(window.jQuery); /* ========================================================== - * bootstrap-affix.js v2.3.0 + * bootstrap-affix.js v2.3.2 * http://twitter.github.com/bootstrap/javascript.html#affix * ========================================================== * Copyright 2012 Twitter, Inc.