mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '3.0.0-wip' into bs3_homepage

Browse Source 
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-18 20:15:45 -07:00
parent cf09e6a6b5 f584500211
commit a9378a9267
17 changed files with 179 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_includes/nav-components.html
+1 -2
View File
@@ -93,8 +93,7 @@
<li>
<a href="#alerts">Alerts</a>
<ul class="nav">
<li><a href="#alerts-default">Default alert</a></li>
<li><a href="#alerts-alternatives">Contextual alternatives</a></li>
<li><a href="#alerts-examples">Examples</a></li>
<li><a href="#alerts-dismissable">Dismissable alerts</a></li>
<li><a href="#alerts-links">Links in alerts</a></li>
</ul>