github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

Browse Source 
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
This commit is contained in:
Arnold Daniels
2012-11-29 23:49:42 +01:00
parent 6b7027eaec 3b3dd3ac3c
commit 176ab8f778
124 changed files with 4463 additions and 2958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -1,7 +1,7 @@
[Jasny Bootstrap](http://jasny.github.com/bootstrap)
=================
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
This version is extended by [Arnold Daniels](http://twitter.com/ArnoldDaniels) of [Jasny](http://www.jasny.net) and contains a number of extra features.
@@ -12,7 +12,7 @@ To get started, checkout http://jasny.github.com/bootstrap!
Quick start
-----------
Clone the repo, `git clone git://github.com/jasny/bootstrap.git`, or [download the latest release](https://github.com/jasny/bootstrap/zipball/master).
Clone the repo, `git clone git://github.com/jasny/bootstrap.git`, or [download the latest release](https://github.com/jasny/bootstrap/zipball/master), or install with twitter's [Bower](http://twitter.github.com/bower): `bower install jasny/bootstrap`.
@@ -73,7 +73,7 @@ $ npm install recess connect uglify-js jshint -g
```
+ **build** - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://jasny.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://jasny.github.com/bootstrap/extend.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.