clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 04:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
This commit is contained in:
Mark Otto 2012-01-24 16:09:32 -08:00
commit 7e6797880a
5 changed files with 346 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/application.js
View File

@ -22,7 +22,7 @@ $(function(){
window.prettyPrint && prettyPrint()
// table sort example
if ($.fn.tableSorter) {
if ($.fn.tablesorter) {
$("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
$(".tablesorter-example").tablesorter({ sortList: [[1,0]] })
}

10
docs/index.html
View File

@ -75,7 +75,7 @@
<h4>Feature highlights</h4>
<ul>
<li><span>&#10004;</span> Built on LESS</li>
<li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Complete styleguide docs</li>
<li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&#10004;</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">&middot;</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">

666
docs/templates/pages/components.mustache vendored
View File

File diff suppressed because it is too large Load Diff

24
docs/templates/pages/index.mustache vendored
View File

@ -14,13 +14,13 @@
<div class="benefits">
<h4>{{_i}}Feature highlights{{/i}}</h4>
<ul>
<li>{{_i}}<span>&#10004;</span> Built on LESS{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Complete style guide docs{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Fully responsive design{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Small footprint (10kb gzipped){{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Support for IE7 and up{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Custom jQuery plugins{{/i}}</li>
<li>{{_i}}<span>&#10004;</span> Dozens of components{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Small footprint (10kb gzipped){{/i}}</li>
<li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Dozens of components{{/i}}</li>
</ul>
</div>
</div>
@ -39,15 +39,9 @@
<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">&middot;</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>
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
</li>
<li class="tweet-btn">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
@ -116,7 +110,7 @@
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_082_roundabout.png">
<h2>{{_i}}Growing library{{/i}}</h2>
<p>{{_i}}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.{{/i}}</p>
<p>{{_i}}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.{{/i}}</p>
</div>
<div class="span4">
<img class="icon" src="assets/img/glyphicons/glyphicons_009_magic.png">

2
docs/templates/pages/javascript.mustache vendored
View File

@ -646,7 +646,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<tr>
<th style="width: 100px;">{{_i}}Name{{/i}}</th>
<th style="width: 100px;">{{_i}}type{{/i}}</th>
<th style="width: 50px;"{{_i}}>default{{/i}}</th>
<th style="width: 50px;">{{_i}}default{{/i}}</th>
<th>{{_i}}description{{/i}}</th>
</tr>
</thead>