Commit 356100e7 authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #8251 from acmetech/3.0.0-wip

Remove offcanvas from footer and change placeholder in css.html
parents 2535e060 9d43fbb5
4 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1
Showing with 6 additions and 10 deletions
+6 -10
...@@ -4,10 +4,6 @@ ...@@ -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>
......
...@@ -1757,26 +1757,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -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 %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment