mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch 'glyphicons_font' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
This commit is contained in:
Mark Otto
2012-11-03 16:15:54 -07:00
parent c0eacca0db 4b3fb30877
commit a56de2b84f
25 changed files with 1436 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/tests/buttons.html
+71
View File
@@ -34,6 +34,77 @@
<div class="container">
<h2>Icons in buttons</h2>
<p>
<button class="btn btn-large" type="button">
Profile
</button>
<button class="btn btn-large" type="button">
<span class="glyphicon-user"></span> Profile
</button>
<button class="btn btn-large" type="button">
<span class="glyphicon-home"></span> Home
</button>
<button class="btn btn-large" type="button">
<span class="glyphicon-link"></span> Link
</button>
</p>
<p>
<button class="btn" type="button">
Profile
</button>
<button class="btn" type="button">
<span class="glyphicon-user"></span> Profile
</button>
<button class="btn" type="button">
<span class="glyphicon-home"></span> Home
</button>
<button class="btn" type="button">
<span class="glyphicon-link"></span> Link
</button>
</p>
<p>
<button class="btn btn-small" type="button">
Profile
</button>
<button class="btn btn-small" type="button">
<span class="glyphicon-user"></span> Profile
</button>
<button class="btn btn-small" type="button">
<span class="glyphicon-home"></span> Home
</button>
<button class="btn btn-small" type="button">
<span class="glyphicon-link"></span> Link
</button>
</p>
<p>
<button class="btn btn-mini" type="button">
Profile
</button>
<button class="btn btn-mini" type="button">
<span class="glyphicon-user"></span> Profile
</button>
<button class="btn btn-mini" type="button">
<span class="glyphicon-home"></span> Home
</button>
<button class="btn btn-mini" type="button">
<span class="glyphicon-link"></span> Link
</button>
</p>
<div class="btn-toolbar">
<div class="btn-group">
<a class="btn" href="#"><i class="glyphicon-align-left"></i></a>
<a class="btn" href="#"><i class="glyphicon-align-center"></i></a>
<a class="btn" href="#"><i class="glyphicon-align-right"></i></a>
<a class="btn" href="#"><i class="glyphicon-align-justify"></i></a>
</div>
</div>
<hr>
<h2>Dropups</h2>
<div class="btn-toolbar">
<div class="btn-group dropup">