diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:43:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:43:03 -0700 |
| commit | 6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b (patch) | |
| tree | 5b3377b4b90ed6cabdcecc9e1915c792b9d97e7e /examples | |
| parent | d8fab5aa6e828567feaa4cb3a171255e29f42165 (diff) | |
| parent | 98378d2d88fc92f6c0f3a1db2a861409074c010a (diff) | |
| download | bootstrap-6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b.tar.xz bootstrap-6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/navbar/navbar.css | 7 | ||||
| -rw-r--r-- | examples/theme/index.html | 24 |
2 files changed, 28 insertions, 3 deletions
diff --git a/examples/navbar/navbar.css b/examples/navbar/navbar.css index f593a6bfc..d2195240b 100644 --- a/examples/navbar/navbar.css +++ b/examples/navbar/navbar.css @@ -1,7 +1,8 @@ body { -padding: 30px; + padding-top: 20px; + padding-bottom: 20px; } .navbar { -margin-bottom: 30px; -}
\ No newline at end of file + margin-bottom: 20px; +} diff --git a/examples/theme/index.html b/examples/theme/index.html index a0bad8793..bfa8efdcb 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -159,6 +159,18 @@ <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="dropdown-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> </div><!--/.nav-collapse --> </div> @@ -179,6 +191,18 @@ <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li class="dropdown-header">Nav header</li> + <li><a href="#">Separated link</a></li> + <li><a href="#">One more separated link</a></li> + </ul> + </li> </ul> </div><!--/.nav-collapse --> </div> |