From: Mark Otto Date: Tue, 24 Jan 2012 22:28:14 +0000 (-0800) Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip X-Git-Tag: v2.0.0~6^2~229 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58f7fd308a5c4511cf9a10a12c89d550c469b3f1;p=thirdparty%2Fbootstrap.git Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip Conflicts: docs/templates/pages/index.mustache --- 58f7fd308a5c4511cf9a10a12c89d550c469b3f1 diff --cc docs/index.html index 25e76cb545,d0c0bcae60..0beff1e7e2 --- a/docs/index.html +++ b/docs/index.html @@@ -74,13 -74,13 +74,13 @@@

Feature highlights

@@@ -217,33 -217,33 +217,32 @@@ ================================================== -->

Get started in no time.

Quickly start using Bootstrap within your workflow and development process.

- - - - - - - - - -
-

Hotlink the CSS

-

For the quickest and easiest start, just copy this snippet into your webpage.

-
- -
- 		-

Use it with LESS

-

A fan of using LESS? No problem, just clone the repo and add these lines:

-
- -
- 		-

Fork on GitHub

-

Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

-

Bootstrap on GitHub »

-

Currently v2.0.0

-
+
+
+
+

Hotlink the CSS

+

For the quickest and easiest start, just copy this snippet into your webpage.

+
+ +
+
+
-

Use it with LESS.js

++

Use it with LESS

+

A fan of using LESS? No problem, just download the repo and add these lines to your page:

+
+ +
+
+
+

Fork on GitHub

+

Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

+

Bootstrap on GitHub »

+

Currently v2.0.0

+
+
+
+ -

Get started in no time.

-

Quickly start using Bootstrap within your workflow and development process.

- +

{{_i}}Get started in no time.{{/i}}

+

{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}

- - - - - - - - -
-

{{_i}}Hotlink the CSS{{/i}}

-

{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}

-
- -
- 		-

{{_i}}Use it with LESS{{/i}}

-

{{_i}}A fan of using LESS? No problem, just clone the repo and add these lines:{{/i}}

-
- -
- 		-

{{_i}}Fork on GitHub{{/i}}

-

{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}

-

{{_i}}Bootstrap on GitHub »{{/i}}

-

Currently v2.0.0

-
+
+
+
-

Hotlink the CSS

-

For the quickest and easiest start, just copy this snippet into your webpage.

++

{{_i}}Hotlink the CSS{{/i}}

++

{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}

+
+ +
+
+
-

Use it with LESS.js

-

A fan of using LESS? No problem, just download the repo and add these lines to your page:

++

{{_i}}Use it with LESS{{/i}}

++

{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}

+
+ +
+
+
-

Fork on GitHub

-

Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.

-

Bootstrap on GitHub »

-

Currently v2.0.0

++

{{_i}}Fork on GitHub{{/i}}

++

{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}

++

{{_i}}Bootstrap on GitHub »{{/i}}

++

{{_i}}Currently{{/i}} v2.0.0

+
+
+
+