diff options
| author | Mark Otto <[email protected]> | 2012-01-27 14:21:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 14:21:17 -0800 |
| commit | 003da1e089edf06c528667009fb59189b5f0e4cc (patch) | |
| tree | 271b162c7b8af4b8c6bb0f7e09d07926a696156a | |
| parent | 6353e5070ae429297bdfb215f17093e4ccbc08f2 (diff) | |
| download | bootstrap-003da1e089edf06c528667009fb59189b5f0e4cc.tar.xz bootstrap-003da1e089edf06c528667009fb59189b5f0e4cc.zip | |
fix inputs in navbar
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | examples/container-app.html | 4 | ||||
| -rw-r--r-- | less/navbar.less | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 10faa36c0..5ebfba675 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 13:54:49 PST 2012 + * Date: Fri Jan 27 14:21:03 PST 2012 */ article, aside, @@ -1901,6 +1901,7 @@ table .span12 { } .navbar-form input, .navbar-form select { display: inline-block; + margin-top: 5px; margin-bottom: 0; } .navbar-search { diff --git a/examples/container-app.html b/examples/container-app.html index 9bf651753..df0e8dba4 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap.css" rel="stylesheet"> + <link href="../docs/assets/css/bootstrap.css" rel="stylesheet"> <style type="text/css"> /* Override some defaults */ html, body { @@ -70,7 +70,7 @@ <body> - <div class="navbar navbar-fixed"> + <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">Project name</a> diff --git a/less/navbar.less b/less/navbar.less index 7a4b631d1..602e26ae8 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -60,6 +60,7 @@ input, select { display: inline-block; + margin-top: 5px; margin-bottom: 0; } } |