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

Conflicts: bootstrap.css
2011-12-11 00:58:10 -08:00 · 2011-12-11 00:58:10 -08:00 · 6de3ed5322
commit 6de3ed5322
parent 200fe25d0a 6e70d490e1
4 changed files with 20 additions and 1 deletions
--- a/docs/components.html
+++ b/docs/components.html
@ -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">