Commit 3111a85f authored by Thomas Park's avatar Thomas Park
Browse files

update bootstrap to 3.3.6

parent ffda96bc
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
"*/index.html" "*/index.html"
], ],
"dependencies": { "dependencies": {
"bootstrap": "~3.3.5" "bootstrap": "~3.3.6"
}, },
"devDependencies": { "devDependencies": {
"bootstrap-sass-official": "~3.3.5", "bootstrap-sass-official": "~3.3.6",
"font-awesome": "~4.0.0", "font-awesome": "~4.0.0",
"html5shiv": "~3.7.0", "html5shiv": "~3.7.0",
"respond": "~1.4.2" "respond": "~1.4.2"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"Peter Gumeson", "Peter Gumeson",
"Gleb Mazovetskiy" "Gleb Mazovetskiy"
], ],
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
"moduleType": "globals", "moduleType": "globals",
"main": [ "main": [
"assets/stylesheets/_bootstrap.scss", "assets/stylesheets/_bootstrap.scss",
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
"dependencies": { "dependencies": {
"jquery": ">= 1.9.0" "jquery": ">= 1.9.0"
}, },
"version": "3.3.5", "version": "3.3.6",
"_release": "3.3.5", "_release": "3.3.6",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v3.3.5", "tag": "v3.3.6",
"commit": "fe686dbe44641fabbb8960fc9e549dd9d1670366" "commit": "7d7cc02b968b50ea53b0f2e59906b4b7f3fbcf0e"
}, },
"_source": "git://github.com/twbs/bootstrap-sass.git", "_source": "git://github.com/twbs/bootstrap-sass.git",
"_target": "~3.3.5", "_target": "~3.3.6",
"_originalSource": "bootstrap-sass-official" "_originalSource": "bootstrap-sass-official"
} }
\ No newline at end of file
# Changelog # Changelog
## 3.3.6
Bumps Sass dependency to 3.3.4+ to avoid compatibility issues with @at-root.
Bumps node-sass dependency to ~3.4.2 for Node.js v5 compatibility. [#986](https://github.com/twbs/bootstrap-sass/issues/986)
Fixes breadcrumb content issues on libsass. [#919](https://github.com/twbs/bootstrap-sass/issues/919)
Fixes a Rails 5 compatibility issue. [#965](https://github.com/twbs/bootstrap-sass/pull/965)
Framework version: Bootstrap **v3.3.6**
## 3.3.5 ## 3.3.5
Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914) Fix for standalone Compass extension compatibility. [#914](https://github.com/twbs/bootstrap-sass/issues/914)
......
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013 Twitter, Inc Copyright (c) 2013-2015 Twitter, Inc
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
[![Gem Version](https://badge.fury.io/rb/bootstrap-sass.svg)](http://badge.fury.io/rb/bootstrap-sass) [![Gem Version](https://badge.fury.io/rb/bootstrap-sass.svg)](http://badge.fury.io/rb/bootstrap-sass)
[![npm version](https://img.shields.io/npm/v/bootstrap-sass.svg?style=flat)](https://www.npmjs.com/package/bootstrap-sass) [![npm version](https://img.shields.io/npm/v/bootstrap-sass.svg?style=flat)](https://www.npmjs.com/package/bootstrap-sass)
[![Bower Version](https://badge.fury.io/bo/bootstrap-sass.svg)](http://badge.fury.io/bo/bootstrap-sass) [![Bower Version](https://badge.fury.io/bo/bootstrap-sass.svg)](http://badge.fury.io/bo/bootstrap-sass)
[![Build Status](http://img.shields.io/travis/twbs/bootstrap-sass.svg)](http://travis-ci.org/twbs/bootstrap-sass) [![Build Status](https://img.shields.io/travis/twbs/bootstrap-sass.svg)](https://travis-ci.org/twbs/bootstrap-sass)
`bootstrap-sass` is a Sass-powered version of [Bootstrap](http://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications. `bootstrap-sass` is a Sass-powered version of [Bootstrap](https://github.com/twbs/bootstrap) 3, ready to drop right into your Sass powered applications.
This is Bootstrap 3. For Bootstrap 4 use the [Bootstrap Ruby gem](http://github.com/twbs/bootstrap-rubygem) if you use Ruby, and the [main repo](http://github.com/twbs/bootstrap) otherwise.
## Installation ## Installation
...@@ -21,7 +23,7 @@ Please see the appropriate guide for your environment of choice: ...@@ -21,7 +23,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. 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 ```ruby
gem 'bootstrap-sass', '~> 3.3.5' gem 'bootstrap-sass', '~> 3.3.6'
gem 'sass-rails', '>= 3.2' gem 'sass-rails', '>= 3.2'
``` ```
...@@ -44,9 +46,9 @@ it may come with a `.css` file instead. If this file exists, it will be served i ...@@ -44,9 +46,9 @@ it may come with a `.css` file instead. If this file exists, it will be served i
$ mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss $ mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss
``` ```
Then, remove all the `//= require` and `//= require_tree` statements from the file. Instead, use `@import` to import Sass files. Then, remove all the `*= require_self` and `*= require_tree .` statements from the sass file. Instead, use `@import` to import Sass files.
Do not use `//= require` in Sass or your other stylesheets will not be [able to access][antirequire] the Bootstrap mixins or variables. Do not use `*= require` in Sass or your other stylesheets will not be [able to access][antirequire] the Bootstrap mixins or variables.
Require Bootstrap Javascripts in `app/assets/javascripts/application.js`: Require Bootstrap Javascripts in `app/assets/javascripts/application.js`:
...@@ -285,6 +287,7 @@ The upstream versions vs the Bootstrap for Sass versions are: ...@@ -285,6 +287,7 @@ The upstream versions vs the Bootstrap for Sass versions are:
| Upstream | Sass | | Upstream | Sass |
|---------:|--------:| |---------:|--------:|
| 3.3.6 | 3.3.6 |
| 3.3.5 | 3.3.5 | | 3.3.5 | 3.3.5 |
| 3.3.4 | 3.3.4 | | 3.3.4 | 3.3.4 |
| 3.3.2 | 3.3.3 | | 3.3.2 | 3.3.3 |
...@@ -340,8 +343,8 @@ and a [significant number of other contributors][contrib]. ...@@ -340,8 +343,8 @@ and a [significant number of other contributors][contrib].
## You're in good company ## You're in good company
bootstrap-sass is used to build some awesome projects all over the web, including bootstrap-sass is used to build some awesome projects all over the web, including
[Diaspora](https://diasporafoundation.org/), [rails_admin](https://github.com/sferik/rails_admin), [Diaspora](https://diasporafoundation.org/), [rails_admin](https://github.com/sferik/rails_admin),
Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://gitlabhq.com/) and Michael Hartl's [Rails Tutorial](https://www.railstutorial.org/), [gitlabhq](http://gitlabhq.com/) and
[kandan](http://kandan.io/). [kandan](http://getkandan.com/).
[converter]: https://github.com/twbs/bootstrap-sass/blob/master/tasks/converter/less_conversion.rb [converter]: https://github.com/twbs/bootstrap-sass/blob/master/tasks/converter/less_conversion.rb
[version]: https://github.com/twbs/bootstrap-sass/blob/master/lib/bootstrap-sass/version.rb [version]: https://github.com/twbs/bootstrap-sass/blob/master/lib/bootstrap-sass/version.rb
...@@ -350,4 +353,4 @@ Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://g ...@@ -350,4 +353,4 @@ Michael Hartl's [Rails Tutorial](http://railstutorial.org/), [gitlabhq](http://g
[jsdocs]: http://getbootstrap.com/javascript/#transitions [jsdocs]: http://getbootstrap.com/javascript/#transitions
[sass-precision]: http://sass-lang.com/documentation/Sass/Script/Value/Number.html#precision%3D-class_method [sass-precision]: http://sass-lang.com/documentation/Sass/Script/Value/Number.html#precision%3D-class_method
[mincer]: https://github.com/nodeca/mincer [mincer]: https://github.com/nodeca/mincer
[autoprefixer]: https://github.com/ai/autoprefixer [autoprefixer]: https://github.com/postcss/autoprefixer
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
//= require ./bootstrap/carousel //= require ./bootstrap/carousel
//= require ./bootstrap/collapse //= require ./bootstrap/collapse
//= require ./bootstrap/dropdown //= require ./bootstrap/dropdown
//= require ./bootstrap/modal
//= require ./bootstrap/scrollspy
//= require ./bootstrap/tab //= require ./bootstrap/tab
//= require ./bootstrap/transition //= require ./bootstrap/transition
//= require ./bootstrap/scrollspy
//= require ./bootstrap/modal
//= require ./bootstrap/tooltip //= require ./bootstrap/tooltip
//= require ./bootstrap/popover //= require ./bootstrap/popover
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under the MIT license * Licensed under the MIT license
*/ */
...@@ -11,13 +11,13 @@ if (typeof jQuery === 'undefined') { ...@@ -11,13 +11,13 @@ if (typeof jQuery === 'undefined') {
+function ($) { +function ($) {
'use strict'; '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) || (version[0] > 2)) {
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, but lower than version 3')
} }
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: transition.js v3.3.5 * Bootstrap: transition.js v3.3.6
* http://getbootstrap.com/javascript/#transitions * http://getbootstrap.com/javascript/#transitions
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') { ...@@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.5 * Bootstrap: alert.js v3.3.6
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') { ...@@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') {
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.5' Alert.VERSION = '3.3.6'
Alert.TRANSITION_DURATION = 150 Alert.TRANSITION_DURATION = 150
...@@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') { ...@@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: button.js v3.3.5 * Bootstrap: button.js v3.3.6
* http://getbootstrap.com/javascript/#buttons * http://getbootstrap.com/javascript/#buttons
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') { ...@@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') {
this.isLoading = false this.isLoading = false
} }
Button.VERSION = '3.3.5' Button.VERSION = '3.3.6'
Button.DEFAULTS = { Button.DEFAULTS = {
loadingText: 'loading...' loadingText: 'loading...'
...@@ -293,7 +293,7 @@ if (typeof jQuery === 'undefined') { ...@@ -293,7 +293,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: carousel.js v3.3.5 * Bootstrap: carousel.js v3.3.6
* http://getbootstrap.com/javascript/#carousel * http://getbootstrap.com/javascript/#carousel
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -324,7 +324,7 @@ if (typeof jQuery === 'undefined') { ...@@ -324,7 +324,7 @@ if (typeof jQuery === 'undefined') {
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
} }
Carousel.VERSION = '3.3.5' Carousel.VERSION = '3.3.6'
Carousel.TRANSITION_DURATION = 600 Carousel.TRANSITION_DURATION = 600
...@@ -531,7 +531,7 @@ if (typeof jQuery === 'undefined') { ...@@ -531,7 +531,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: collapse.js v3.3.5 * Bootstrap: collapse.js v3.3.6
* http://getbootstrap.com/javascript/#collapse * http://getbootstrap.com/javascript/#collapse
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -561,7 +561,7 @@ if (typeof jQuery === 'undefined') { ...@@ -561,7 +561,7 @@ if (typeof jQuery === 'undefined') {
if (this.options.toggle) this.toggle() if (this.options.toggle) this.toggle()
} }
Collapse.VERSION = '3.3.5' Collapse.VERSION = '3.3.6'
Collapse.TRANSITION_DURATION = 350 Collapse.TRANSITION_DURATION = 350
...@@ -743,7 +743,7 @@ if (typeof jQuery === 'undefined') { ...@@ -743,7 +743,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: dropdown.js v3.3.5 * Bootstrap: dropdown.js v3.3.6
* http://getbootstrap.com/javascript/#dropdowns * http://getbootstrap.com/javascript/#dropdowns
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -763,7 +763,7 @@ if (typeof jQuery === 'undefined') { ...@@ -763,7 +763,7 @@ if (typeof jQuery === 'undefined') {
$(element).on('click.bs.dropdown', this.toggle) $(element).on('click.bs.dropdown', this.toggle)
} }
Dropdown.VERSION = '3.3.5' Dropdown.VERSION = '3.3.6'
function getParent($this) { function getParent($this) {
var selector = $this.attr('data-target') var selector = $this.attr('data-target')
...@@ -795,7 +795,7 @@ if (typeof jQuery === 'undefined') { ...@@ -795,7 +795,7 @@ if (typeof jQuery === 'undefined') {
if (e.isDefaultPrevented()) return if (e.isDefaultPrevented()) return
$this.attr('aria-expanded', 'false') $this.attr('aria-expanded', 'false')
$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget) $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
}) })
} }
...@@ -829,7 +829,7 @@ if (typeof jQuery === 'undefined') { ...@@ -829,7 +829,7 @@ if (typeof jQuery === 'undefined') {
$parent $parent
.toggleClass('open') .toggleClass('open')
.trigger('shown.bs.dropdown', relatedTarget) .trigger($.Event('shown.bs.dropdown', relatedTarget))
} }
return false return false
...@@ -909,7 +909,7 @@ if (typeof jQuery === 'undefined') { ...@@ -909,7 +909,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: modal.js v3.3.5 * Bootstrap: modal.js v3.3.6
* http://getbootstrap.com/javascript/#modals * http://getbootstrap.com/javascript/#modals
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -943,7 +943,7 @@ if (typeof jQuery === 'undefined') { ...@@ -943,7 +943,7 @@ if (typeof jQuery === 'undefined') {
} }
} }
Modal.VERSION = '3.3.5' Modal.VERSION = '3.3.6'
Modal.TRANSITION_DURATION = 300 Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150 Modal.BACKDROP_TRANSITION_DURATION = 150
...@@ -1247,7 +1247,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1247,7 +1247,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tooltip.js v3.3.5 * Bootstrap: tooltip.js v3.3.6
* 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
* ======================================================================== * ========================================================================
...@@ -1274,7 +1274,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1274,7 +1274,7 @@ if (typeof jQuery === 'undefined') {
this.init('tooltip', element, options) this.init('tooltip', element, options)
} }
Tooltip.VERSION = '3.3.5' Tooltip.VERSION = '3.3.6'
Tooltip.TRANSITION_DURATION = 150 Tooltip.TRANSITION_DURATION = 150
...@@ -1762,7 +1762,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1762,7 +1762,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: popover.js v3.3.5 * Bootstrap: popover.js v3.3.6
* http://getbootstrap.com/javascript/#popovers * http://getbootstrap.com/javascript/#popovers
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -1782,7 +1782,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1782,7 +1782,7 @@ if (typeof jQuery === 'undefined') {
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
Popover.VERSION = '3.3.5' Popover.VERSION = '3.3.6'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right', placement: 'right',
...@@ -1871,7 +1871,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1871,7 +1871,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: scrollspy.js v3.3.5 * Bootstrap: scrollspy.js v3.3.6
* http://getbootstrap.com/javascript/#scrollspy * http://getbootstrap.com/javascript/#scrollspy
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -1900,7 +1900,7 @@ if (typeof jQuery === 'undefined') { ...@@ -1900,7 +1900,7 @@ if (typeof jQuery === 'undefined') {
this.process() this.process()
} }
ScrollSpy.VERSION = '3.3.5' ScrollSpy.VERSION = '3.3.6'
ScrollSpy.DEFAULTS = { ScrollSpy.DEFAULTS = {
offset: 10 offset: 10
...@@ -2044,7 +2044,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2044,7 +2044,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: tab.js v3.3.5 * Bootstrap: tab.js v3.3.6
* http://getbootstrap.com/javascript/#tabs * http://getbootstrap.com/javascript/#tabs
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -2064,7 +2064,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2064,7 +2064,7 @@ if (typeof jQuery === 'undefined') {
// jscs:enable requireDollarBeforejQueryAssignment // jscs:enable requireDollarBeforejQueryAssignment
} }
Tab.VERSION = '3.3.5' Tab.VERSION = '3.3.6'
Tab.TRANSITION_DURATION = 150 Tab.TRANSITION_DURATION = 150
...@@ -2200,7 +2200,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2200,7 +2200,7 @@ if (typeof jQuery === 'undefined') {
}(jQuery); }(jQuery);
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.5 * Bootstrap: affix.js v3.3.6
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -2229,7 +2229,7 @@ if (typeof jQuery === 'undefined') { ...@@ -2229,7 +2229,7 @@ if (typeof jQuery === 'undefined') {
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.5' Affix.VERSION = '3.3.6'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'
......
/* ======================================================================== /* ========================================================================
* Bootstrap: affix.js v3.3.5 * Bootstrap: affix.js v3.3.6
* http://getbootstrap.com/javascript/#affix * http://getbootstrap.com/javascript/#affix
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
this.checkPosition() this.checkPosition()
} }
Affix.VERSION = '3.3.5' Affix.VERSION = '3.3.6'
Affix.RESET = 'affix affix-top affix-bottom' Affix.RESET = 'affix affix-top affix-bottom'
......
/* ======================================================================== /* ========================================================================
* Bootstrap: alert.js v3.3.5 * Bootstrap: alert.js v3.3.6
* http://getbootstrap.com/javascript/#alerts * http://getbootstrap.com/javascript/#alerts
* ======================================================================== * ========================================================================
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close) $(el).on('click', dismiss, this.close)
} }
Alert.VERSION = '3.3.5' Alert.VERSION = '3.3.6'