]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6353e50)
fix inputs in navbar
authorMark Otto <markdotto@gmail.com>
Fri, 27 Jan 2012 22:21:17 +0000 (14:21 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 27 Jan 2012 22:21:17 +0000 (14:21 -0800)
docs/assets/css/bootstrap.css patch | blob | blame | history
examples/container-app.html patch | blob | blame | history
less/navbar.less patch | blob | blame | history

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 10faa36c08c609c3c1286f89ccef0b9968f71dd9..5ebfba675c9986af2c8bea719c837617e13cc1f6 100644 (file)
--- 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 9bf651753ae3ba94cf332f5e83f9d898223e67d1..df0e8dba4856ed674f34da0d047a1c78bfd619ad 100644 (file)
--- 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 7a4b631d15c22194a01abf79745822005db31449..602e26ae86655308d0898a4b67e351a0c8c7ca1c 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -60,6 +60,7 @@
   input,
   select {
     display: inline-block;
+    margin-top: 5px;
     margin-bottom: 0;
   }
 }
Mirror of https://github.com/twbs/bootstrap.git