Skip to content

Commit

Permalink
Bootstrap v3.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mrohnstock committed Mar 17, 2015
1 parent 908a35a commit 699ecb6
Show file tree
Hide file tree
Showing 38 changed files with 313 additions and 248 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "components-bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.3.2",
"version": "3.3.4",
"keywords": [
"css",
"less",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"repo": "components/bootstrap",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.3.2",
"version": "3.3.4",
"keywords": [
"css",
"less",
Expand Down
2 changes: 1 addition & 1 deletion css/bootstrap-theme.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/bootstrap-theme.min.css

Large diffs are not rendered by default.

48 changes: 33 additions & 15 deletions css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/bootstrap.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions js/affix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.3.2
* Bootstrap: affix.js v3.3.4
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -21,14 +21,14 @@
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))

this.$element = $(element)
this.affixed =
this.unpin =
this.affixed = null
this.unpin = null
this.pinnedOffset = null

this.checkPosition()
}

Affix.VERSION = '3.3.2'
Affix.VERSION = '3.3.4'

Affix.RESET = 'affix affix-top affix-bottom'

Expand Down Expand Up @@ -78,7 +78,7 @@
var offset = this.options.offset
var offsetTop = offset.top
var offsetBottom = offset.bottom
var scrollHeight = $('body').height()
var scrollHeight = $(document.body).height()

if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
Expand Down
4 changes: 2 additions & 2 deletions js/alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: alert.js v3.3.2
* Bootstrap: alert.js v3.3.4
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand All @@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}

Alert.VERSION = '3.3.2'
Alert.VERSION = '3.3.4'

Alert.TRANSITION_DURATION = 150

Expand Down
Loading

0 comments on commit 699ecb6

Please sign in to comment.