From d87893395c78ef54a8f4101cfd424541ee0d2807 Mon Sep 17 00:00:00 2001 From: Derek Stegelman Date: Sun, 26 Aug 2012 18:21:45 -0500 Subject: [PATCH 1/2] bootstrap 2.0.3 --- .../bootstrap/css/bootstrap-responsive.css | 13 +- bootstrap/static/bootstrap/css/bootstrap.css | 233 ++++++++---------- .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin .../img/glyphicons/glyphicons_009_magic.png | Bin .../img/glyphicons/glyphicons_042_group.png | Bin .../img/glyphicons/glyphicons_079_podium.png | Bin .../glyphicons/glyphicons_082_roundabout.png | Bin .../glyphicons_155_show_thumbnails.png | Bin .../img/glyphicons/glyphicons_163_iphone.png | Bin .../glyphicons_214_resize_small.png | Bin .../glyphicons/glyphicons_266_book_open.png | Bin .../static/bootstrap/img/grid-18px-masked.png | Bin .../static/bootstrap/js/bootstrap-alert.js | 2 +- .../static/bootstrap/js/bootstrap-button.js | 2 +- .../static/bootstrap/js/bootstrap-carousel.js | 2 +- .../static/bootstrap/js/bootstrap-collapse.js | 2 +- .../static/bootstrap/js/bootstrap-dropdown.js | 2 +- .../static/bootstrap/js/bootstrap-modal.js | 2 +- .../static/bootstrap/js/bootstrap-popover.js | 2 +- .../bootstrap/js/bootstrap-scrollspy.js | 4 +- .../static/bootstrap/js/bootstrap-tab.js | 2 +- .../static/bootstrap/js/bootstrap-tooltip.js | 6 +- .../bootstrap/js/bootstrap-transition.js | 2 +- .../bootstrap/js/bootstrap-typeahead.js | 4 +- bootstrap/static/bootstrap/js/bootstrap.js | 33 ++- .../static/bootstrap/js/bootstrap.min.js | 2 +- .../js/google-code-prettify/prettify.css | 0 .../js/google-code-prettify/prettify.js | 0 bootstrap/static/bootstrap/js/jquery.js | 0 30 files changed, 141 insertions(+), 172 deletions(-) mode change 100644 => 100755 bootstrap/static/bootstrap/css/bootstrap-responsive.css mode change 100644 => 100755 bootstrap/static/bootstrap/css/bootstrap.css mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons-halflings-white.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons-halflings.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_009_magic.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_042_group.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_079_podium.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_082_roundabout.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_155_show_thumbnails.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_163_iphone.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_214_resize_small.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/glyphicons/glyphicons_266_book_open.png mode change 100644 => 100755 bootstrap/static/bootstrap/img/grid-18px-masked.png mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-alert.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-button.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-carousel.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-collapse.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-dropdown.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-modal.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-popover.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-scrollspy.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-tab.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-tooltip.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-transition.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap-typeahead.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/bootstrap.min.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/google-code-prettify/prettify.css mode change 100644 => 100755 bootstrap/static/bootstrap/js/google-code-prettify/prettify.js mode change 100644 => 100755 bootstrap/static/bootstrap/js/jquery.js diff --git a/bootstrap/static/bootstrap/css/bootstrap-responsive.css b/bootstrap/static/bootstrap/css/bootstrap-responsive.css old mode 100644 new mode 100755 index 06e55c0..7f669d5 --- a/bootstrap/static/bootstrap/css/bootstrap-responsive.css +++ b/bootstrap/static/bootstrap/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.0.4 + * Bootstrap Responsive v2.0.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -683,18 +683,11 @@ body { padding-top: 0; } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } .navbar-fixed-top { + position: static; margin-bottom: 18px; } - .navbar-fixed-bottom { - margin-top: 18px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { + .navbar-fixed-top .navbar-inner { padding: 5px; } .navbar .container { diff --git a/bootstrap/static/bootstrap/css/bootstrap.css b/bootstrap/static/bootstrap/css/bootstrap.css old mode 100644 new mode 100755 index bb40c85..09e2833 --- a/bootstrap/static/bootstrap/css/bootstrap.css +++ b/bootstrap/static/bootstrap/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.4 + * Bootstrap v2.0.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -73,10 +73,6 @@ img { -ms-interpolation-mode: bicubic; } -#map_canvas img { - max-width: none; -} - button, input, select, @@ -422,6 +418,9 @@ a:hover { p { margin: 0 0 9px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 18px; } p small { @@ -604,7 +603,7 @@ em { abbr[title] { cursor: help; - border-bottom: 1px dotted #999999; + border-bottom: 1px dotted #ddd; } abbr.initialism { @@ -741,7 +740,7 @@ legend { line-height: 36px; color: #333333; border: 0; - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid #eee; } legend small { @@ -769,119 +768,79 @@ textarea { label { display: block; margin-bottom: 5px; + color: #333333; } -select, +input, textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], +select, .uneditable-input { display: inline-block; + width: 210px; height: 18px; padding: 4px; margin-bottom: 9px; font-size: 13px; line-height: 18px; color: #555555; -} - -input, -textarea { - width: 210px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { background-color: #ffffff; border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; } -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ +.uneditable-textarea { + width: auto; + height: auto; +} - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); +label input, +label textarea, +label select { + display: block; } -input[type="radio"], -input[type="checkbox"] { +input[type="image"], +input[type="checkbox"], +input[type="radio"] { + width: auto; + height: auto; + padding: 0; margin: 3px 0; *margin-top: 0; /* IE7 */ line-height: normal; cursor: pointer; + background-color: transparent; + border: 0 \9; + /* IE9 and down */ + + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { +input[type="image"] { + border: 0; +} + +input[type="file"] { width: auto; + padding: initial; + line-height: initial; + background-color: #ffffff; + background-color: initial; + border: initial; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.uneditable-textarea { +input[type="button"], +input[type="reset"], +input[type="submit"] { width: auto; height: auto; } @@ -897,9 +856,13 @@ input[type="file"] { line-height: 28px; } +input[type="file"] { + line-height: 18px \9; +} + select { width: 220px; - border: 1px solid #bbb; + background-color: #ffffff; } select[multiple], @@ -907,13 +870,18 @@ select[size] { height: auto; } -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; +input[type="image"] { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + +textarea { + height: auto; +} + +input[type="hidden"] { + display: none; } .radio, @@ -946,6 +914,42 @@ input[type="checkbox"]:focus { margin-left: 10px; } +input, +textarea { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; + -ms-transition: border linear 0.2s, box-shadow linear 0.2s; + -o-transition: border linear 0.2s, box-shadow linear 0.2s; + transition: border linear 0.2s, box-shadow linear 0.2s; +} + +input:focus, +textarea:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + outline: thin dotted \9; + /* IE6-9 */ + + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); +} + +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus, +select:focus { + outline: thin dotted #333; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + .input-mini { width: 60px; } @@ -982,15 +986,6 @@ textarea[class*="span"], margin-left: 0; } -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - input, textarea, .uneditable-input { @@ -1093,8 +1088,6 @@ input[type="checkbox"][readonly] { color: #c09853; } -.control-group.warning .checkbox, -.control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { @@ -1102,8 +1095,6 @@ input[type="checkbox"][readonly] { border-color: #c09853; } -.control-group.warning .checkbox:focus, -.control-group.warning .radio:focus, .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { @@ -1126,8 +1117,6 @@ input[type="checkbox"][readonly] { color: #b94a48; } -.control-group.error .checkbox, -.control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { @@ -1135,8 +1124,6 @@ input[type="checkbox"][readonly] { border-color: #b94a48; } -.control-group.error .checkbox:focus, -.control-group.error .radio:focus, .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { @@ -1159,8 +1146,6 @@ input[type="checkbox"][readonly] { color: #468847; } -.control-group.success .checkbox, -.control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { @@ -1168,8 +1153,6 @@ input[type="checkbox"][readonly] { border-color: #468847; } -.control-group.success .checkbox:focus, -.control-group.success .radio:focus, .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { @@ -1207,7 +1190,7 @@ select:focus:required:invalid:focus { margin-top: 18px; margin-bottom: 18px; background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; + border-top: 1px solid #ddd; *zoom: 1; } @@ -1236,10 +1219,6 @@ select:focus:required:invalid:focus { color: #999999; } -:-ms-input-placeholder { - color: #999999; -} - ::-webkit-input-placeholder { color: #999999; } @@ -2454,11 +2433,11 @@ table .span24 { *z-index: 1000; } -.open > .dropdown-menu { +.open .dropdown-menu { display: block; } -.pull-right > .dropdown-menu { +.pull-right .dropdown-menu { right: 0; left: auto; } @@ -2520,6 +2499,7 @@ table .span24 { .fade { opacity: 0; + filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; -ms-transition: opacity 0.15s linear; @@ -2529,6 +2509,7 @@ table .span24 { .fade.in { opacity: 1; + filter: alpha(opacity=100); } .collapse { @@ -3720,10 +3701,6 @@ input[type="submit"].btn.btn-mini { color: #cccccc; } -.navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - .navbar-search .search-query::-webkit-input-placeholder { color: #cccccc; } diff --git a/bootstrap/static/bootstrap/img/glyphicons-halflings-white.png b/bootstrap/static/bootstrap/img/glyphicons-halflings-white.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons-halflings.png b/bootstrap/static/bootstrap/img/glyphicons-halflings.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_009_magic.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_009_magic.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_042_group.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_042_group.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_079_podium.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_079_podium.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_082_roundabout.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_082_roundabout.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_155_show_thumbnails.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_155_show_thumbnails.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_163_iphone.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_163_iphone.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_214_resize_small.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_214_resize_small.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/glyphicons/glyphicons_266_book_open.png b/bootstrap/static/bootstrap/img/glyphicons/glyphicons_266_book_open.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/img/grid-18px-masked.png b/bootstrap/static/bootstrap/img/grid-18px-masked.png old mode 100644 new mode 100755 diff --git a/bootstrap/static/bootstrap/js/bootstrap-alert.js b/bootstrap/static/bootstrap/js/bootstrap-alert.js old mode 100644 new mode 100755 index 57890a9..fa0806e --- a/bootstrap/static/bootstrap/js/bootstrap-alert.js +++ b/bootstrap/static/bootstrap/js/bootstrap-alert.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-alert.js v2.0.4 + * bootstrap-alert.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-button.js b/bootstrap/static/bootstrap/js/bootstrap-button.js old mode 100644 new mode 100755 index 7f187be..a9e6ba7 --- a/bootstrap/static/bootstrap/js/bootstrap-button.js +++ b/bootstrap/static/bootstrap/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-button.js v2.0.4 + * bootstrap-button.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-carousel.js b/bootstrap/static/bootstrap/js/bootstrap-carousel.js old mode 100644 new mode 100755 index 551de58..96e5a81 --- a/bootstrap/static/bootstrap/js/bootstrap-carousel.js +++ b/bootstrap/static/bootstrap/js/bootstrap-carousel.js @@ -1,5 +1,5 @@ /* ========================================================== - * bootstrap-carousel.js v2.0.4 + * bootstrap-carousel.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-collapse.js b/bootstrap/static/bootstrap/js/bootstrap-collapse.js old mode 100644 new mode 100755 index fbc915b..d02f6fd --- a/bootstrap/static/bootstrap/js/bootstrap-collapse.js +++ b/bootstrap/static/bootstrap/js/bootstrap-collapse.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-collapse.js v2.0.4 + * bootstrap-collapse.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-dropdown.js b/bootstrap/static/bootstrap/js/bootstrap-dropdown.js old mode 100644 new mode 100755 index 454a968..ec0588d --- a/bootstrap/static/bootstrap/js/bootstrap-dropdown.js +++ b/bootstrap/static/bootstrap/js/bootstrap-dropdown.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-dropdown.js v2.0.4 + * bootstrap-dropdown.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-modal.js b/bootstrap/static/bootstrap/js/bootstrap-modal.js old mode 100644 new mode 100755 index 38fd0c8..c831de6 --- a/bootstrap/static/bootstrap/js/bootstrap-modal.js +++ b/bootstrap/static/bootstrap/js/bootstrap-modal.js @@ -1,5 +1,5 @@ /* ========================================================= - * bootstrap-modal.js v2.0.4 + * bootstrap-modal.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-popover.js b/bootstrap/static/bootstrap/js/bootstrap-popover.js old mode 100644 new mode 100755 index 39fbe35..d5ecfa9 --- a/bootstrap/static/bootstrap/js/bootstrap-popover.js +++ b/bootstrap/static/bootstrap/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.0.4 + * bootstrap-popover.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-scrollspy.js b/bootstrap/static/bootstrap/js/bootstrap-scrollspy.js old mode 100644 new mode 100755 index dce3718..f6a24b0 --- a/bootstrap/static/bootstrap/js/bootstrap-scrollspy.js +++ b/bootstrap/static/bootstrap/js/bootstrap-scrollspy.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-scrollspy.js v2.0.4 + * bootstrap-scrollspy.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -35,7 +35,7 @@ this.selector = (this.options.target || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 || '') + ' .nav li > a' - this.$body = $('body') + this.$body = $('body').on('click.scroll.data-api', this.selector, process) this.refresh() this.process() } diff --git a/bootstrap/static/bootstrap/js/bootstrap-tab.js b/bootstrap/static/bootstrap/js/bootstrap-tab.js old mode 100644 new mode 100755 index d87f350..88641de --- a/bootstrap/static/bootstrap/js/bootstrap-tab.js +++ b/bootstrap/static/bootstrap/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tab.js v2.0.4 + * bootstrap-tab.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-tooltip.js b/bootstrap/static/bootstrap/js/bootstrap-tooltip.js old mode 100644 new mode 100755 index b476f1c..577ead4 --- a/bootstrap/static/bootstrap/js/bootstrap-tooltip.js +++ b/bootstrap/static/bootstrap/js/bootstrap-tooltip.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-tooltip.js v2.0.4 + * bootstrap-tooltip.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -84,9 +84,9 @@ , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (this.timeout) clearTimeout(this.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() + clearTimeout(this.timeout) self.hoverState = 'out' this.timeout = setTimeout(function() { if (self.hoverState == 'out') self.hide() @@ -272,4 +272,4 @@ , delay: 0 } -}(window.jQuery); +}(window.jQuery); \ No newline at end of file diff --git a/bootstrap/static/bootstrap/js/bootstrap-transition.js b/bootstrap/static/bootstrap/js/bootstrap-transition.js old mode 100644 new mode 100755 index 5341826..7e29b2f --- a/bootstrap/static/bootstrap/js/bootstrap-transition.js +++ b/bootstrap/static/bootstrap/js/bootstrap-transition.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.0.4 + * bootstrap-transition.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. diff --git a/bootstrap/static/bootstrap/js/bootstrap-typeahead.js b/bootstrap/static/bootstrap/js/bootstrap-typeahead.js old mode 100644 new mode 100755 index ad44b90..ada0526 --- a/bootstrap/static/bootstrap/js/bootstrap-typeahead.js +++ b/bootstrap/static/bootstrap/js/bootstrap-typeahead.js @@ -1,5 +1,5 @@ /* ============================================================= - * bootstrap-typeahead.js v2.0.4 + * bootstrap-typeahead.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -56,7 +56,7 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) diff --git a/bootstrap/static/bootstrap/js/bootstrap.js b/bootstrap/static/bootstrap/js/bootstrap.js old mode 100644 new mode 100755 index 5d6e65b..4c4673f --- a/bootstrap/static/bootstrap/js/bootstrap.js +++ b/bootstrap/static/bootstrap/js/bootstrap.js @@ -1,5 +1,5 @@ /* =================================================== - * bootstrap-transition.js v2.0.4 + * bootstrap-transition.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. @@ -59,7 +59,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.0.4 + * bootstrap-alert.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== * Copyright 2012 Twitter, Inc. @@ -148,7 +148,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.0.4 + * bootstrap-button.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. @@ -243,7 +243,7 @@ }) }(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.0.4 + * bootstrap-carousel.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. @@ -411,7 +411,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.0.4 + * bootstrap-collapse.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. @@ -567,7 +567,7 @@ }) }(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.0.4 + * bootstrap-dropdown.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. @@ -666,7 +666,7 @@ }) }(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.0.4 + * bootstrap-modal.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. @@ -883,7 +883,7 @@ }) }(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.0.4 + * bootstrap-tooltip.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== @@ -968,9 +968,9 @@ , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (this.timeout) clearTimeout(this.timeout) if (!self.options.delay || !self.options.delay.hide) return self.hide() + clearTimeout(this.timeout) self.hoverState = 'out' this.timeout = setTimeout(function() { if (self.hoverState == 'out') self.hide() @@ -1156,9 +1156,8 @@ , delay: 0 } -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.0.4 +}(window.jQuery);/* =========================================================== + * bootstrap-popover.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -1255,7 +1254,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.0.4 + * bootstrap-scrollspy.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#scrollspy * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1291,7 +1290,7 @@ this.selector = (this.options.target || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 || '') + ' .nav li > a' - this.$body = $('body') + this.$body = $('body').on('click.scroll.data-api', this.selector, process) this.refresh() this.process() } @@ -1405,7 +1404,7 @@ }) }(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.0.4 + * bootstrap-tab.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. @@ -1539,7 +1538,7 @@ }) }(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.0.4 + * bootstrap-typeahead.js v2.0.3 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. @@ -1596,7 +1595,7 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) diff --git a/bootstrap/static/bootstrap/js/bootstrap.min.js b/bootstrap/static/bootstrap/js/bootstrap.min.js old mode 100644 new mode 100755 index d5ccdee..7cf02a6 --- a/bootstrap/static/bootstrap/js/bootstrap.min.js +++ b/bootstrap/static/bootstrap/js/bootstrap.min.js @@ -3,4 +3,4 @@ * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('