2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider

Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2011-12-11 00:58:10 -08:00
4 changed files with 20 additions and 1 deletions
+1
View File
@@ -180,6 +180,7 @@
<input type="text" class="search-query span2" placeholder="Search">
</form>
<ul class="nav secondary-nav">
<li class="divider"></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle">Dropdown</a>
<ul class="dropdown-menu">