Skip to content

Commit

Permalink
Bootstrap v3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mrohnstock committed Oct 30, 2014
1 parent 09948b0 commit 220ece7
Show file tree
Hide file tree
Showing 62 changed files with 1,414 additions and 837 deletions.
17 changes: 11 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
{
"name": "components-bootstrap",
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.2.0",
"version": "3.3.0",
"keywords": [
"bootstrap",
"css"
"css",
"less",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"license": "Apache-2.0",
"license": "MIT",
"dependencies": {
"jquery": ">=1.9.0"
"jquery": ">=1.9.1"
},
"main": "js/bootstrap.js",
"ignore": [
Expand Down
17 changes: 11 additions & 6 deletions component.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{
"name": "components-bootstrap",
"repo": "components/bootstrap",
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"homepage": "http://getbootstrap.com",
"version": "3.2.0",
"version": "3.3.0",
"keywords": [
"bootstrap",
"css"
"css",
"less",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"license": "Apache-2.0",
"license": "MIT",
"dependencies": {
"components/jquery": "*"
"components/jquery": ">=1.9.1"
},
"main": "js/bootstrap.js",
"scripts": [
Expand Down
22 changes: 16 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
{
"name": "components/bootstrap",
"description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
"description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
"type": "component",
"keywords": [
"bootstrap",
"css"
"css",
"less",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"license": "Apache-2.0",
"license": "MIT",
"authors": [
{
"name": "Twitter, Inc"
"name": "Mark Otto",
"email": "[email protected]"
},
{
"name": "Jacob Thornton",
"email": "[email protected]"
}
],
"require": {
"components/jquery": ">=1.9"
"components/jquery": ">=1.9.1"
},
"suggest": {
"components/bootstrap-default": "Provide a theme for Bootstrap as components/bootstrap only provides the CSS as file assets"
Expand Down
37 changes: 26 additions & 11 deletions css/bootstrap-theme.css
100755 → 100644

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
100755 → 100644

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/bootstrap-theme.min.css
100755 → 100644

Large diffs are not rendered by default.

Loading

0 comments on commit 220ece7

Please sign in to comment.