Skip to content

Commit

Permalink
Bootstrap v3.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mrohnstock committed Nov 24, 2015
1 parent d71c2a2 commit fb49239
Show file tree
Hide file tree
Showing 42 changed files with 153 additions and 173 deletions.
4 changes: 2 additions & 2 deletions 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.5",
"version": "3.3.6",
"keywords": [
"css",
"less",
Expand All @@ -14,7 +14,7 @@
],
"license": "MIT",
"dependencies": {
"jquery": ">=1.9.1"
"jquery": "1.9.1 - 2"
},
"main": "js/bootstrap.js",
"ignore": [
Expand Down
12 changes: 8 additions & 4 deletions 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.5",
"version": "3.3.6",
"keywords": [
"css",
"less",
Expand All @@ -15,17 +15,21 @@
],
"license": "MIT",
"dependencies": {
"components/jquery": ">=1.9.1"
"components/jquery": "1.9.1 - 2"
},
"main": "js/bootstrap.js",
"scripts": [
"js/bootstrap.js"
],
"files": [
"css/bootstrap.css",
"css/bootstrap.css.map",
"css/bootstrap-theme.css",
"css/bootstrap-theme.css.map",
"css/bootstrap.min.css",
"css/bootstrap.min.css.map"
"css/bootstrap-theme.min.css",
"css/bootstrap.css.map",
"css/bootstrap-theme.css.map"
"css/bootstrap-theme.min.css.map"
],
"fonts": [
"fonts/glyphicons-halflings-regular.eot",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}
],
"require": {
"components/jquery": ">=1.9.1 <3.0"
"components/jquery": "1.9.1 - 2"
},
"suggest": {
"components/bootstrap-default": "Provide a theme for Bootstrap as components/bootstrap only provides the CSS as file assets"
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.css.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions css/bootstrap-theme.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap-theme.min.css.map

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

100 changes: 30 additions & 70 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.

5 changes: 3 additions & 2 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap.min.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/affix.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ========================================================================
* Bootstrap: affix.js v3.3.5
* Bootstrap: affix.js v3.3.6
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
Expand Down Expand Up @@ -28,7 +28,7 @@
this.checkPosition()
}

Affix.VERSION = '3.3.5'
Affix.VERSION = '3.3.6'

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

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.5
* Bootstrap: alert.js v3.3.6
* 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.5'
Alert.VERSION = '3.3.6'

Alert.TRANSITION_DURATION = 150

Expand Down
Loading

0 comments on commit fb49239

Please sign in to comment.