mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 23:04:32 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
2012-01-29 19:07:14 -08:00
parent fae04c8ac1 2ba1b01f8d
commit 0de951f4f4
7 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

7
docs/assets/css/docs.css
View File

@@ -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 {

2
docs/components.html
View File

@@ -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>

2
docs/templates/pages/components.mustache vendored
View File

@@ -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>