mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-01-27 13:43:51 -08:00
parent 335a8686da 16a28d881c
commit 8da1c176ec
12 changed files with 234 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+46 -16
View File
@@ -1338,10 +1338,6 @@
<i class="icon home"></i>
<i class="icon file"></i>
<i class="icon time"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon road"></i>
<i class="icon download-alt"></i>
<i class="icon download"></i>
@@ -1349,8 +1345,12 @@
<i class="icon inbox"></i>
<i class="icon play-circle"></i>
<i class="icon repeat"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon refresh"></i>
<i class="icon calendar"></i>
<i class="icon list-alt"></i>
<i class="icon lock"></i>
<i class="icon flag"></i>
<i class="icon headphones"></i>
@@ -1366,10 +1366,6 @@
<i class="icon bookmark"></i>
<i class="icon print"></i>
<i class="icon camera"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon font"></i>
<i class="icon bold"></i>
<i class="icon italic"></i>
@@ -1384,7 +1380,10 @@
<i class="icon indent-right"></i>
<i class="icon facetime-video"></i>
<i class="icon picture"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon pencil"></i>
<i class="icon map-marker"></i>
<i class="icon adjust"></i>
@@ -1394,10 +1393,6 @@
<i class="icon check"></i>
<i class="icon move"></i>
<i class="icon step-backward"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon fast-backward"></i>
<i class="icon backward"></i>
<i class="icon play"></i>
@@ -1410,6 +1405,20 @@
<i class="icon chevron-left"></i>
<i class="icon chevron-right"></i>
<i class="icon plus-sign"></i>
<i class="icon minus-sign"></i>
<i class="icon remove-sign"></i>
<i class="icon ok-sign"></i>
<i class="icon question-sign"></i>
<i class="icon info-sign"></i>
<i class="icon screenshot"></i>
<i class="icon remove-circle"></i>
<i class="icon ok-circle"></i>
<i class="icon ban-circle"></i>
</div>
</div>
<div class="span3">
<div class="the-icons">
<i class="icon arrow-left"></i>
<i class="icon arrow-right"></i>
<i class="icon arrow-up"></i>
@@ -1420,6 +1429,27 @@
<i class="icon plus"></i>
<i class="icon minus"></i>
<i class="icon asterisk"></i>
<i class="icon exclamation-sign"></i>
<i class="icon gift"></i>
<i class="icon leaf"></i>
<i class="icon fire"></i>
<i class="icon eye-open"></i>
<i class="icon eye-close"></i>
<i class="icon warning-sign"></i>
<i class="icon plane"></i>
<i class="icon calendar"></i>
<i class="icon random"></i>
<i class="icon comment"></i>
<i class="icon magnet"></i>
<i class="icon chevron-up"></i>
<i class="icon chevron-down"></i>
<i class="icon retweet"></i>
<i class="icon shopping-cart"></i>
<i class="icon folder-close"></i>
<i class="icon folder-open"></i>
<i class="icon resize-vertical"></i>
<i class="icon resize-horizontal"></i>
</div>
</div>
</div>
@@ -1441,7 +1471,7 @@
<pre class="prettyprint linenums">
&lt;i class="icon search"&gt;&lt;/i&gt;
</pre>
<p>There are over 100 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
<p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
</div>
<div class="span4">
<h3>Use cases</h3>
@@ -1462,7 +1492,7 @@
<p>Use them in buttons, or in button groups for a toolbar style presentation.</p>
<p>
<a class="btn" href="#"><i class="icon refresh"></i> Refresh</a>
<a class="btn" href="#"><i class="icon cog"></i> Settings</a>
<a class="btn danger" href="#"><i class="icon white trash"></i> Delete</a>
</p>
<div class="btn-toolbar">
<div class="btn-group">