diff options
| author | Mark Otto <[email protected]> | 2013-07-26 22:03:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 22:03:52 -0700 |
| commit | 44a4e7121534a4aeb74ac260e17ee536457449f9 (patch) | |
| tree | 8410595a689999d72889d9442edd7b24cacfe3d5 | |
| parent | 5bed9f4635495cfd2f710cbdb631689dfa1d0d87 (diff) | |
| download | bootstrap-44a4e7121534a4aeb74ac260e17ee536457449f9.tar.xz bootstrap-44a4e7121534a4aeb74ac260e17ee536457449f9.zip | |
Fix clipped dropdowns in input groups section of docs
| -rw-r--r-- | assets/css/docs.css | 3 | ||||
| -rw-r--r-- | css.html | 281 |
2 files changed, 152 insertions, 132 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css index 8843d2480..243c922f1 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -418,9 +418,6 @@ body { .bs-example-control-sizing input[type="text"] + input[type="text"] { margin-top: 10px; } -.bs-example-form { - overflow: hidden; -} .bs-example-form .input-group { margin-bottom: 10px; } @@ -1545,34 +1545,34 @@ For example, <code><section></code> should be wrapped as inline. </div> <form class="bs-example bs-example-form"> - <div class="input-group col-lg-9"> + <div class="input-group"> <span class="input-group-addon">@</span> <input type="text" class="form-control" placeholder="Username"> </div> <br> - <div class="input-group col-lg-6"> + <div class="input-group"> <input type="text" class="form-control"> <span class="input-group-addon">.00</span> </div> <br> - <div class="input-group col-lg-3"> + <div class="input-group"> <span class="input-group-addon">$</span> <input type="text" class="form-control"> <span class="input-group-addon">.00</span> </div> </form> {% highlight html %} -<div class="input-group col-lg-9"> +<div class="input-group"> <span class="input-group-addon">@</span> <input type="text" class="form-control" placeholder="Username"> </div> -<div class="input-group col-lg-6"> +<div class="input-group"> <input type="text" class="form-control"> <span class="input-group-addon">.00</span> </div> -<div class="input-group col-lg-3"> +<div class="input-group"> <span class="input-group-addon">$</span> <input type="text" class="form-control"> <span class="input-group-addon">.00</span> @@ -1582,33 +1582,33 @@ For example, <code><section></code> should be wrapped as inline. <h3>Optional sizes</h3> <p>Add the relative form sizing classes to the <code>.input-group-addon</code>.</p> <form class="bs-example bs-example-form"> - <div class="input-group col-lg-9"> + <div class="input-group"> <span class="input-group-addon input-large">@</span> <input type="text" class="form-control input-large" placeholder="Username"> </div> <br> - <div class="input-group col-lg-9"> + <div class="input-group"> <span class="input-group-addon">@</span> <input type="text" class="form-control" placeholder="Username"> </div> <br> - <div class="input-group col-lg-9"> + <div class="input-group"> <span class="input-group-addon input-small">@</span> <input type="text" class="form-control input-small" placeholder="Username"> </div> </form> {% highlight html %} -<div class="input-group col-lg-9"> +<div class="input-group"> <span class="input-group-addon input-large">@</span> <input type="text" class="form-control input-large" placeholder="Username"> </div> -<div class="input-group col-lg-9"> +<div class="input-group"> <span class="input-group-addon">@</span> <input type="text" class="form-control" placeholder="Username"> </div> -<div class="input-group col-lg-9"> +<div class="input-group"> <span class="input-group-addon input-small">@</span> <input type="text" class="form-control input-small" placeholder="Username"> </div> @@ -1617,144 +1617,167 @@ For example, <code><section></code> should be wrapped as inline. <h3>Buttons instead of text</h3> <p>Buttons in input groups are a bit different and require one extra level of nesting. Instead of <code>.input-group-addon</code>, you'll need to use <code>.input-group-btn</code> to wrap the buttons. This is required due to default browser styles that cannot be overridden.</p> <form class="bs-example bs-example-form"> - <div class="input-group col-lg-7"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Go!</button> - </span> - <input type="text" class="form-control"> - </div> - <br> - <div class="input-group col-lg-7"> - <input type="text" class="form-control"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Go!</button> - </span> - </div> + <div class="row"> + <div class="col-lg-6"> + <div class="input-group"> + <span class="input-group-btn"> + <button class="btn btn-default" type="button">Go!</button> + </span> + <input type="text" class="form-control"> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + <div class="col-lg-6"> + <div class="input-group"> + <input type="text" class="form-control"> + <span class="input-group-btn"> + <button class="btn btn-default" type="button">Go!</button> + </span> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + </div><!-- /.row --> </form> {% highlight html %} -<div class="input-group col-lg-7"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Go!</button> - </span> - <input type="text" class="form-control"> -</div> - -<div class="input-group col-lg-7"> - <input type="text" class="form-control"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Go!</button> - </span> -</div> +<div class="row"> + <div class="col-lg-6"> + <div class="input-group"> + <span class="input-group-btn"> + <button class="btn btn-default" type="button">Go!</button> + </span> + <input type="text" class="form-control"> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + <div class="col-lg-6"> + <div class="input-group"> + <input type="text" class="form-control"> + <span class="input-group-btn"> + <button class="btn btn-default" type="button">Go!</button> + </span> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> +</div><!-- /.row --> {% endhighlight %} <h3>Button dropdowns</h3> <p></p> <form class="bs-example bs-example-form"> - <div class="input-group col-lg-7"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div><!-- /btn-group --> - <input type="text" class="form-control"> - </div><!-- /input-group --> - <br> - <div class="input-group col-lg-7"> - <input type="text" class="form-control"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu pull-right"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div><!-- /btn-group --> - </div><!-- /input-group --> + <div class="row"> + <div class="col-lg-6"> + <div class="input-group"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div><!-- /btn-group --> + <input type="text" class="form-control"> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + <div class="col-lg-6"> + <div class="input-group"> + <input type="text" class="form-control"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div><!-- /btn-group --> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + </div><!-- /.row --> </form> {% highlight html %} -<div class="input-group col-lg-7"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div><!-- /btn-group --> - <input type="text" class="form-control"> -</div><!-- /input-group --> - -<div class="input-group col-lg-7"> - <input type="text" class="form-control"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> - <ul class="dropdown-menu pull-right"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div><!-- /btn-group --> -</div><!-- /input-group --> +<div class="row"> + <div class="col-lg-6"> + <div class="input-group"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div><!-- /btn-group --> + <input type="text" class="form-control"> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> + <div class="col-lg-6"> + <div class="input-group"> + <input type="text" class="form-control"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action <span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div><!-- /btn-group --> + </div><!-- /input-group --> + </div><!-- /.col-lg-6 --> +</div><!-- /.row --> {% endhighlight %} <h3>Segmented dropdown groups</h3> <form class="bs-example bs-example-form"> - <div class="input-group col-lg-7"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default" tabindex="-1">Action</button> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1"> - <span class="caret"></span> - </button> - <ul class="dropdown-menu"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div> - <input type="text" class="form-control"> - </div> - - <br> - - <div class="input-group col-lg-7"> - <input type="text" class="form-control"> - <div class="input-group-btn"> - <button type="button" class="btn btn-default" tabindex="-1">Action</button> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1"> - <span class="caret"></span> - </button> - <ul class="dropdown-menu pull-right"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li><a href="#">Separated link</a></li> - </ul> - </div> - </div> + <div class="row"> + <div class="col-lg-6"> + <div class="input-group"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default" tabindex="-1">Action</button> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + <input type="text" class="form-control"> + </div><!-- /.input-group --> + </div><!-- /.col-lg-6 --> + <div class="col-lg-6"> + <div class="input-group"> + <input type="text" class="form-control"> + <div class="input-group-btn"> + <button type="button" class="btn btn-default" tabindex="-1">Action</button> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu pull-right"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + </div><!-- /.input-group --> + </div><!-- /.col-lg-6 --> + </div><!-- /.row --> </form> {% highlight html %} -<div class="input-group col-lg-7"> +<div class="input-group"> <div class="input-group-btn"> <!-- Button and dropdown menu --> </div> <input type="text" class="form-control"> </div> -<div class="input-group col-lg-7"> +<div class="input-group"> <input type="text" class="form-control"> <div class="input-group-btn btn-group"> <!-- Button and dropdown menu --> |
