From ea56c37ca9674f0155448699918650bbfcfbb888 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Tue, 16 Jun 2015 21:40:15 -0400 Subject: update bootstrap to 3.3.5 --- bower.json | 4 +- .../bootstrap-sass-official/.bower.json | 16 +- .../bootstrap-sass-official/CHANGELOG.md | 6 + bower_components/bootstrap-sass-official/README.md | 7 +- .../assets/javascripts/bootstrap-sprockets.js | 4 +- .../assets/javascripts/bootstrap.js | 240 ++++++++------ .../assets/javascripts/bootstrap.min.js | 8 +- .../assets/javascripts/bootstrap/affix.js | 6 +- .../assets/javascripts/bootstrap/alert.js | 4 +- .../assets/javascripts/bootstrap/button.js | 22 +- .../assets/javascripts/bootstrap/carousel.js | 4 +- .../assets/javascripts/bootstrap/collapse.js | 4 +- .../assets/javascripts/bootstrap/dropdown.js | 88 ++--- .../assets/javascripts/bootstrap/modal.js | 12 +- .../assets/javascripts/bootstrap/popover.js | 4 +- .../assets/javascripts/bootstrap/scrollspy.js | 4 +- .../assets/javascripts/bootstrap/tab.js | 8 +- .../assets/javascripts/bootstrap/tooltip.js | 78 +++-- .../assets/javascripts/bootstrap/transition.js | 2 +- .../assets/stylesheets/_bootstrap.scss | 6 + .../assets/stylesheets/bootstrap/_badges.scss | 2 +- .../stylesheets/bootstrap/_button-groups.scss | 5 +- .../assets/stylesheets/bootstrap/_buttons.scss | 18 +- .../assets/stylesheets/bootstrap/_carousel.scss | 4 +- .../assets/stylesheets/bootstrap/_dropdowns.scss | 4 +- .../assets/stylesheets/bootstrap/_forms.scss | 59 +++- .../assets/stylesheets/bootstrap/_glyphicons.scss | 20 +- .../stylesheets/bootstrap/_input-groups.scss | 1 + .../assets/stylesheets/bootstrap/_jumbotron.scss | 8 +- .../assets/stylesheets/bootstrap/_list-group.scss | 12 +- .../assets/stylesheets/bootstrap/_media.scss | 5 + .../assets/stylesheets/bootstrap/_mixins.scss | 1 + .../assets/stylesheets/bootstrap/_normalize.scss | 19 +- .../assets/stylesheets/bootstrap/_pagination.scss | 5 +- .../assets/stylesheets/bootstrap/_panels.scss | 6 + .../assets/stylesheets/bootstrap/_popovers.scss | 12 +- .../assets/stylesheets/bootstrap/_print.scss | 6 - .../bootstrap/_responsive-utilities.scss | 6 +- .../assets/stylesheets/bootstrap/_scaffolding.scss | 3 +- .../assets/stylesheets/bootstrap/_theme.scss | 28 +- .../assets/stylesheets/bootstrap/_tooltip.scss | 9 +- .../assets/stylesheets/bootstrap/_variables.scss | 8 +- .../bootstrap/mixins/_background-variant.scss | 3 +- .../stylesheets/bootstrap/mixins/_buttons.scss | 20 +- .../bootstrap/mixins/_grid-framework.scss | 4 +- .../assets/stylesheets/bootstrap/mixins/_grid.scss | 4 +- .../stylesheets/bootstrap/mixins/_hide-text.scss | 2 +- .../stylesheets/bootstrap/mixins/_list-group.scss | 5 +- .../stylesheets/bootstrap/mixins/_pagination.scss | 3 +- .../stylesheets/bootstrap/mixins/_reset-text.scss | 18 + .../bootstrap/mixins/_responsive-visibility.scss | 2 +- .../bootstrap/mixins/_text-emphasis.scss | 3 +- .../bootstrap-sass-official/bower.json | 7 +- .../bootstrap-sass-official/package.json | 2 +- bower_components/bootstrap/.bower.json | 20 +- bower_components/bootstrap/Gruntfile.js | 56 +++- bower_components/bootstrap/README.md | 23 +- bower_components/bootstrap/bower.json | 11 +- .../bootstrap/dist/css/bootstrap-theme.css | 139 +++++++- .../bootstrap/dist/css/bootstrap-theme.css.map | 2 +- .../bootstrap/dist/css/bootstrap-theme.min.css | 4 +- bower_components/bootstrap/dist/css/bootstrap.css | 368 ++++++++++++++++----- .../bootstrap/dist/css/bootstrap.css.map | 2 +- .../bootstrap/dist/css/bootstrap.min.css | 4 +- bower_components/bootstrap/dist/js/bootstrap.js | 240 ++++++++------ .../bootstrap/dist/js/bootstrap.min.js | 8 +- .../bootstrap/grunt/bs-commonjs-generator.js | 11 +- .../grunt/bs-glyphicons-data-generator.js | 7 +- .../bootstrap/grunt/bs-lessdoc-parser.js | 13 +- .../bootstrap/grunt/bs-raw-files-generator.js | 14 +- bower_components/bootstrap/grunt/configBridge.json | 2 +- .../bootstrap/grunt/sauce_browsers.yml | 2 +- bower_components/bootstrap/js/.jscsrc | 6 + bower_components/bootstrap/js/affix.js | 6 +- bower_components/bootstrap/js/alert.js | 4 +- bower_components/bootstrap/js/button.js | 22 +- bower_components/bootstrap/js/carousel.js | 4 +- bower_components/bootstrap/js/collapse.js | 4 +- bower_components/bootstrap/js/dropdown.js | 88 ++--- bower_components/bootstrap/js/modal.js | 12 +- bower_components/bootstrap/js/popover.js | 4 +- bower_components/bootstrap/js/scrollspy.js | 4 +- bower_components/bootstrap/js/tab.js | 8 +- bower_components/bootstrap/js/tooltip.js | 78 +++-- bower_components/bootstrap/js/transition.js | 2 +- bower_components/bootstrap/less/badges.less | 2 +- bower_components/bootstrap/less/bootstrap.less | 6 + bower_components/bootstrap/less/button-groups.less | 5 +- bower_components/bootstrap/less/buttons.less | 16 +- bower_components/bootstrap/less/carousel.less | 4 +- bower_components/bootstrap/less/dropdowns.less | 4 +- bower_components/bootstrap/less/forms.less | 55 ++- bower_components/bootstrap/less/input-groups.less | 1 + bower_components/bootstrap/less/jumbotron.less | 8 +- bower_components/bootstrap/less/list-group.less | 12 +- bower_components/bootstrap/less/media.less | 5 + bower_components/bootstrap/less/mixins.less | 1 + .../bootstrap/less/mixins/background-variant.less | 3 +- .../bootstrap/less/mixins/buttons.less | 20 +- .../bootstrap/less/mixins/grid-framework.less | 4 +- bower_components/bootstrap/less/mixins/grid.less | 4 +- .../bootstrap/less/mixins/hide-text.less | 2 +- .../bootstrap/less/mixins/list-group.less | 3 +- .../bootstrap/less/mixins/pagination.less | 3 +- .../bootstrap/less/mixins/reset-text.less | 18 + .../less/mixins/responsive-visibility.less | 2 +- .../bootstrap/less/mixins/text-emphasis.less | 3 +- bower_components/bootstrap/less/normalize.less | 19 +- bower_components/bootstrap/less/pagination.less | 5 +- bower_components/bootstrap/less/panels.less | 6 + bower_components/bootstrap/less/popovers.less | 12 +- bower_components/bootstrap/less/print.less | 6 - bower_components/bootstrap/less/scaffolding.less | 3 +- bower_components/bootstrap/less/theme.less | 28 +- bower_components/bootstrap/less/tooltip.less | 9 +- bower_components/bootstrap/less/variables.less | 8 +- bower_components/bootstrap/package.js | 7 +- bower_components/bootstrap/package.json | 58 ++-- bower_components/jquery/.bower.json | 9 +- bower_components/jquery/bower.json | 3 +- bower_components/jquery/dist/jquery.js | 13 +- bower_components/jquery/dist/jquery.min.js | 8 +- bower_components/jquery/dist/jquery.min.map | 2 +- bower_components/jquery/src/core.js | 7 +- bower_components/respond/.bower.json | 7 +- 125 files changed, 1591 insertions(+), 809 deletions(-) create mode 100644 bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins/_reset-text.scss create mode 100644 bower_components/bootstrap/less/mixins/reset-text.less diff --git a/bower.json b/bower.json index c3cae4e2..3d5e0402 100644 --- a/bower.json +++ b/bower.json @@ -31,10 +31,10 @@ "*/index.html" ], "dependencies": { - "bootstrap": "~3.3.4" + "bootstrap": "~3.3.5" }, "devDependencies": { - "bootstrap-sass-official": "~3.3.4", + "bootstrap-sass-official": "~3.3.5", "font-awesome": "~4.0.0", "html5shiv": "~3.7.0", "respond": "~1.4.2" diff --git a/bower_components/bootstrap-sass-official/.bower.json b/bower_components/bootstrap-sass-official/.bower.json index 7ed1cac7..c3807754 100644 --- a/bower_components/bootstrap-sass-official/.bower.json +++ b/bower_components/bootstrap-sass-official/.bower.json @@ -1,6 +1,5 @@ { "name": "bootstrap-sass", - "version": "3.3.4", "homepage": "https://github.com/twbs/bootstrap-sass", "authors": [ "Thomas McDonald", @@ -9,13 +8,9 @@ "Gleb Mazovetskiy" ], "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", + "moduleType": "globals", "main": [ "assets/stylesheets/_bootstrap.scss", - "assets/fonts/bootstrap/glyphicons-halflings-regular.eot", - "assets/fonts/bootstrap/glyphicons-halflings-regular.svg", - "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf", - "assets/fonts/bootstrap/glyphicons-halflings-regular.woff", - "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2", "assets/javascripts/bootstrap.js" ], "keywords": [ @@ -37,13 +32,14 @@ "dependencies": { "jquery": ">= 1.9.0" }, - "_release": "3.3.4", + "version": "3.3.5", + "_release": "3.3.5", "_resolution": { "type": "version", - "tag": "v3.3.4", - "commit": "283bb45d032a94f66cca0888dc9cbc93f44353e0" + "tag": "v3.3.5", + "commit": "fe686dbe44641fabbb8960fc9e549dd9d1670366" }, "_source": "git://github.com/twbs/bootstrap-sass.git", - "_target": "~3.3.4", + "_target": "~3.3.5", "_originalSource": "bootstrap-sass-official" } \ No newline at end of file diff --git a/bower_components/bootstrap-sass-official/CHANGELOG.md b/bower_components/bootstrap-sass-official/CHANGELOG.md index 5dff7ff9..01137960 100644 --- a/bower_components/bootstrap-sass-official/CHANGELOG.md +++ b/bower_components/bootstrap-sass-official/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 3.3.5 + +Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914) + +Framework version: Bootstrap **v3.3.5** + ## 3.3.4 No Sass-specific changes. diff --git a/bower_components/bootstrap-sass-official/README.md b/bower_components/bootstrap-sass-official/README.md index a5180d32..092e186c 100644 --- a/bower_components/bootstrap-sass-official/README.md +++ b/bower_components/bootstrap-sass-official/README.md @@ -21,7 +21,7 @@ Please see the appropriate guide for your environment of choice: In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default. ```ruby -gem 'bootstrap-sass', '~> 3.3.4' +gem 'bootstrap-sass', '~> 3.3.5' gem 'sass-rails', '>= 3.2' ``` @@ -142,7 +142,7 @@ If this happens, change the import order so that Compass mixins are loaded later ### c. Bower -bootstrap-sass Bower package is compatible with node-sass 1.2.3+. You can install it with: +bootstrap-sass Bower package is compatible with node-sass 3.2.0+. You can install it with: ```console $ bower install bootstrap-sass @@ -275,7 +275,7 @@ $navbar-default-color: $light-orange; ## Version Bootstrap for Sass version may differ from the upstream version in the last number, known as -[MINOR](http://semver.org/spec/v2.0.0.html). The minor version may be ahead of the corresponding upstream minor. +[PATCH](http://semver.org/spec/v2.0.0.html). The patch version may be ahead of the corresponding upstream minor. This happens when we need to release Sass-specific changes. Before v3.3.2, Bootstrap for Sass version used to reflect the upstream version, with an additional number for @@ -285,6 +285,7 @@ The upstream versions vs the Bootstrap for Sass versions are: | Upstream | Sass | |---------:|--------:| +| 3.3.5 | 3.3.5 | | 3.3.4 | 3.3.4 | | 3.3.2 | 3.3.3 | | <= 3.3.1 | 3.3.1.x | diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap-sprockets.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap-sprockets.js index 37468b35..1abde496 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap-sprockets.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap-sprockets.js @@ -4,9 +4,9 @@ //= require ./bootstrap/carousel //= require ./bootstrap/collapse //= require ./bootstrap/dropdown -//= require ./bootstrap/modal -//= require ./bootstrap/scrollspy //= require ./bootstrap/tab //= require ./bootstrap/transition +//= require ./bootstrap/scrollspy +//= require ./bootstrap/modal //= require ./bootstrap/tooltip //= require ./bootstrap/popover diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js index 1c88b71e..5debfd7d 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js @@ -1,7 +1,7 @@ /*! - * Bootstrap v3.3.4 (http://getbootstrap.com) + * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under the MIT license */ if (typeof jQuery === 'undefined') { @@ -17,7 +17,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: transition.js v3.3.4 + * Bootstrap: transition.js v3.3.5 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: alert.js v3.3.4 + * Bootstrap: alert.js v3.3.5 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') { $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.4' + Alert.VERSION = '3.3.5' Alert.TRANSITION_DURATION = 150 @@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: button.js v3.3.4 + * Bootstrap: button.js v3.3.5 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') { this.isLoading = false } - Button.VERSION = '3.3.4' + Button.VERSION = '3.3.5' Button.DEFAULTS = { loadingText: 'loading...' @@ -204,7 +204,7 @@ if (typeof jQuery === 'undefined') { var val = $el.is('input') ? 'val' : 'html' var data = $el.data() - state = state + 'Text' + state += 'Text' if (data.resetText == null) $el.data('resetText', $el[val]()) @@ -229,15 +229,19 @@ if (typeof jQuery === 'undefined') { if ($parent.length) { var $input = this.$element.find('input') if ($input.prop('type') == 'radio') { - if ($input.prop('checked') && this.$element.hasClass('active')) changed = false - else $parent.find('.active').removeClass('active') + if ($input.prop('checked')) changed = false + $parent.find('.active').removeClass('active') + this.$element.addClass('active') + } else if ($input.prop('type') == 'checkbox') { + if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false + this.$element.toggleClass('active') } - if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change') + $input.prop('checked', this.$element.hasClass('active')) + if (changed) $input.trigger('change') } else { this.$element.attr('aria-pressed', !this.$element.hasClass('active')) + this.$element.toggleClass('active') } - - if (changed) this.$element.toggleClass('active') } @@ -280,7 +284,7 @@ if (typeof jQuery === 'undefined') { var $btn = $(e.target) if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') Plugin.call($btn, 'toggle') - e.preventDefault() + if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault() }) .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) @@ -289,7 +293,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: carousel.js v3.3.4 + * Bootstrap: carousel.js v3.3.5 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -320,7 +324,7 @@ if (typeof jQuery === 'undefined') { .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.4' + Carousel.VERSION = '3.3.5' Carousel.TRANSITION_DURATION = 600 @@ -527,7 +531,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: collapse.js v3.3.4 + * Bootstrap: collapse.js v3.3.5 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -557,7 +561,7 @@ if (typeof jQuery === 'undefined') { if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.4' + Collapse.VERSION = '3.3.5' Collapse.TRANSITION_DURATION = 350 @@ -739,7 +743,7 @@ if (typeof jQuery === 'undefined') { }(jQuery); /* ======================================================================== - * Bootstrap: dropdown.js v3.3.4 + * Bootstrap: dropdown.js v3.3.5 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -759,7 +763,41 @@ if (typeof jQuery === 'undefined') { $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.4' + Dropdown.VERSION = '3.3.5' + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $this = $(this) + var $parent = getParent($this) + var relatedTarget = { relatedTarget: this } + + if (!$parent.hasClass('open')) return + + if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return + + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.attr('aria-expanded', 'false') + $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) + }) + } Dropdown.prototype.toggle = function (e) { var $this = $(this) @@ -774,7 +812,10 @@ if (typeof jQuery === 'undefined') { if (!isActive) { if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { // if mobile we use a backdrop because click events don't delegate - $('