diff options
| author | Jacob Thornton <[email protected]> | 2012-01-29 19:07:14 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-29 19:07:14 -0800 |
| commit | 0de951f4f41c798dead8525e78153fc6c5da1479 (patch) | |
| tree | 4bd75bf2531609e23d743416a9bee7ac7338769c /docs | |
| parent | fae04c8ac1da675338c1cfaf3922223980667281 (diff) | |
| parent | 2ba1b01f8d9a0410d9cf45532d8924d858af74cd (diff) | |
| download | bootstrap-0de951f4f41c798dead8525e78153fc6c5da1479.tar.xz bootstrap-0de951f4f41c798dead8525e78153fc6c5da1479.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 51502 -> 51502 bytes | |||
| -rw-r--r-- | docs/assets/css/docs.css | 7 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex dafd812dc..6eb49b183 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 74b548628..1380b9e6c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -707,6 +707,13 @@ form.well { .subnav .nav > li + li > a { border-top: 1px solid #e5e5e5; } + .subnav .nav > li:first-child > a, + .subnav .nav > li:first-child > a:hover { + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; + } + /* Popovers */ .large-bird { diff --git a/docs/components.html b/docs/components.html index 9fc762fc6..95c7c9907 100644 --- a/docs/components.html +++ b/docs/components.html @@ -758,7 +758,7 @@ <a class="brand" href="#">Project name</a> <!-- Everything you want hidden at 940px or less, place within here --> - <div class="nav-collapse collapse"> + <div class="nav-collapse"> <!-- .nav, .navbar-search, .navbar-form, etc --> </div> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index fd7c464db..7fd1c1ac6 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -686,7 +686,7 @@ <a class="brand" href="#">{{_i}}Project name{{/i}}</a> <!-- Everything you want hidden at 940px or less, place within here --> - <div class="nav-collapse collapse"> + <div class="nav-collapse"> <!-- .nav, .navbar-search, .navbar-form, etc --> </div> |