From: Mark Otto <otto@github.com>
Date: Fri, 26 Jul 2013 22:08:45 +0000 (-0700)
Subject: Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
X-Git-Tag: v3.0.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf0a07f174261e8ee05cfd294d5147e27e22d40;p=thirdparty%2Fbootstrap.git

Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Conflicts:
	css.html
---

1cf0a07f174261e8ee05cfd294d5147e27e22d40
diff --cc css.html
index f49e8bb918,25d73ea659..0401d78d02
--- a/css.html
+++ b/css.html
@@@ -1277,13 -1277,13 +1277,13 @@@ For example, <code>&lt;section&gt;</cod
      </form>
  {% highlight html %}
  <form class="form-horizontal">
 -  <div class="row form-group">
 -    <label for="inputEmail" class="form-control" class="col-lg-2 control-label">Email</label>
 +  <div class="row">
 +    <label for="inputEmail" class="col-lg-2 control-label">Email</label>
      <div class="col-lg-10">
 -      <input type="text" id="inputEmail" placeholder="Email">
 +      <input type="text" class="form-control" id="inputEmail" placeholder="Email">
      </div>
    </div>
-   <div class="row">
+   <div class="row form-group">
      <label for="inputPassword" class="col-lg-2 control-label">Password</label>
      <div class="col-lg-10">
        <input type="password" class="form-control" id="inputPassword" placeholder="Password">