rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #8251 from acmetech/3.0.0-wip

Browse Source 
Remove offcanvas from footer and change placeholder in css.html
This commit is contained in:
Mark Otto 2013-06-21 09:11:54 -07:00
commit 356100e74e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/_includes/footer.html
View File

@ -4,10 +4,6 @@
<script src="/assets/js/jquery.js"></script> <script src="/assets/js/jquery.js"></script>
<script src="/assets/js/bootstrap.js"></script> <script src="/assets/js/bootstrap.js"></script>
<!-- Offcanvas example
================================================== -->
<script src="/assets/js/examples/bootstrap-offcanvas.js"></script>
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="/assets/js/holder/holder.js"></script> <script src="/assets/js/holder/holder.js"></script>

12
docs/css.html
View File

@ -1757,26 +1757,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="bs-example" style="padding-bottom: 15px;"> <form class="bs-example" style="padding-bottom: 15px;">
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
</form> </form>
{% highlight html %} {% highlight html %}
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}