diff options
| author | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
| commit | 7e6797880a969de8b3d44be91dbc765b6ab48612 (patch) | |
| tree | 6078fa9bad27d829eaeb6bf9016399a8f75702e1 /docs/index.html | |
| parent | 8ff621aa26dee69088b527089cdd719bce68be31 (diff) | |
| parent | 03d2128f5072791ca4578a4e50a4540df7c9d121 (diff) | |
| download | bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.tar.xz bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/docs/index.html b/docs/index.html index 1e4b4a270..2bbcaa78a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -75,7 +75,7 @@ <h4>Feature highlights</h4> <ul> <li><span>✔</span> Built on LESS</li> - <li><span>✔</span> Complete style guide docs</li> + <li><span>✔</span> Complete styleguide docs</li> <li><span>✔</span> Fully responsive design</li> <li><span>✔</span> Small footprint (10kb gzipped)</li> <li><span>✔</span> Support for IE7 and up</li> @@ -99,12 +99,6 @@ <li> <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe> </li> -<!-- - <li><strong>Authors</strong></li> - <li><a href="http://twitter.com/mdo">@mdo</a></li> - <li><a href="http://twitter.com/fat">@fat</a></li> - --> - <li class="divider">·</li> <li class="follow-btn"> <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a> @@ -176,7 +170,7 @@ <div class="span4"> <img class="icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png"> <h2>Growing library</h2> - <p>Despite being only 7kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.</p> + <p>Despite being only 10kb (gzipped), Bootstrap is one of the most complete front-end toolkits out there with dozens of fully functional components ready to be put to use.</p> </div> <div class="span4"> <img class="icon" src="assets/img/glyphicons/glyphicons_009_magic.png"> |