Merge branch '3.0.0-wip' into bs3_homepage
Conflicts: dist/css/bootstrap.min.css
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
| { | { | ||
| "name": "twbs/bootstrap" | "name": "twbs/bootstrap" | ||
| , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." | , "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development." | ||
| , "keywords": ["bootstrap", "css"] | , "keywords": ["bootstrap", "css"] | ||
| , "homepage": "http://getbootstrap.com" | , "homepage": "http://getbootstrap.com" | ||
| , "authors": [ | , "authors": [ | ||
| ... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/bootstrap-theme.css
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
42.9 KB
93.2 KB
examples/theme/index.html
0 → 100644
examples/theme/theme.css
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
less/theme.less
0 → 100644