Skip to content

Commit 7286df7

Browse files
committed
added bootstrap 3 with very simple fluid
1 parent 1ae5594 commit 7286df7

File tree

240 files changed

+17624
-45180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+17624
-45180
lines changed
Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
11
{
22
"name": "bootstrap",
3-
"version": "2.3.2",
3+
"version": "3.1.1",
44
"main": [
5-
"./docs/assets/js/bootstrap.js",
6-
"./docs/assets/css/bootstrap.css"
5+
"./dist/css/bootstrap.css",
6+
"./dist/js/bootstrap.js",
7+
"./dist/fonts/glyphicons-halflings-regular.eot",
8+
"./dist/fonts/glyphicons-halflings-regular.svg",
9+
"./dist/fonts/glyphicons-halflings-regular.ttf",
10+
"./dist/fonts/glyphicons-halflings-regular.woff"
11+
],
12+
"ignore": [
13+
"**/.*",
14+
"_config.yml",
15+
"CNAME",
16+
"composer.json",
17+
"CONTRIBUTING.md",
18+
"docs",
19+
"js/tests"
720
],
821
"dependencies": {
9-
"jquery": ">=1.8.0 <2.1.0"
22+
"jquery": ">= 1.9.0"
1023
},
1124
"homepage": "https://github.com/twbs/bootstrap",
12-
"_release": "2.3.2",
25+
"_release": "3.1.1",
1326
"_resolution": {
1427
"type": "version",
15-
"tag": "v2.3.2",
16-
"commit": "b4c4072679943773a7582daa63f545ba818fa627"
28+
"tag": "v3.1.1",
29+
"commit": "a365d8689c3f3cee7f1acf86b61270ecca8e106d"
1730
},
1831
"_source": "git://github.com/twbs/bootstrap.git",
19-
"_target": "2.3.2",
20-
"_originalSource": "bootstrap"
32+
"_target": "3.1.1",
33+
"_originalSource": "bootstrap",
34+
"_direct": true
2135
}

bower_components/bootstrap/.gitignore

Lines changed: 0 additions & 37 deletions
This file was deleted.

bower_components/bootstrap/.travis.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

bower_components/bootstrap/CHANGELOG.md

Lines changed: 0 additions & 368 deletions
This file was deleted.

bower_components/bootstrap/CONTRIBUTING.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)