diff options
| author | Ivan Khalopik <[email protected]> | 2013-06-10 10:31:51 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-06-10 10:31:51 +0300 |
| commit | e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b (patch) | |
| tree | 2d6f41184d19466d6f9fa016ba521260413435cb /docs/components.html | |
| parent | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (diff) | |
| parent | d74a9634b0cb21a712f5e805c7a21132dc9bee5e (diff) | |
| download | bootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.tar.xz bootstrap-e138b0df3a1bcd536cc312d7c4714ff5bc9acd2b.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/components.html b/docs/components.html index 20fdd70dd..44a823a9d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -300,7 +300,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="controls"> <div class="input-group"> <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span> - <input class="col col-lg-2" id="inputIcon" type="text"> + <input class="col-lg-2" id="inputIcon" type="text"> </div> </div> </div> @@ -311,7 +311,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="controls"> <div class="input-group"> <span class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></span> - <input class="col col-lg-2" id="inputIcon" type="text"> + <input class="col-lg-2" id="inputIcon" type="text"> </div> </div> </div> @@ -1302,7 +1302,7 @@ body { padding-bottom: 70px; } </li> </ul> <form class="navbar-form pull-left" action=""> - <input type="text" class="col col-lg-8" placeholder="Search"> + <input type="text" class="col-lg-8" placeholder="Search"> </form> <ul class="nav navbar-nav pull-right"> <li><a href="#">Link</a></li> @@ -1379,7 +1379,7 @@ body { padding-bottom: 70px; } </li> </ul> <form class="navbar-form pull-left" action=""> - <input type="text" class="col col-lg-8" placeholder="Search"> + <input type="text" class="col-lg-8" placeholder="Search"> </form> <ul class="nav navbar-nav pull-right"> <li><a href="#">Link</a></li> @@ -1757,22 +1757,22 @@ body { padding-bottom: 70px; } <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p> <div class="bs-example"> <div class="row"> - <div class="col col-lg-3"> + <div class="col-lg-3"> <a href="#" class="thumbnail"> <img data-src="holder.js/260x180" alt=""> </a> </div> - <div class="col col-lg-3"> + <div class="col-lg-3"> <a href="#" class="thumbnail"> <img data-src="holder.js/260x180" alt=""> </a> </div> - <div class="col col-lg-3"> + <div class="col-lg-3"> <a href="#" class="thumbnail"> <img data-src="holder.js/260x180" alt=""> </a> </div> - <div class="col col-lg-3"> + <div class="col-lg-3"> <a href="#" class="thumbnail"> <img data-src="holder.js/260x180" alt=""> </a> @@ -1781,7 +1781,7 @@ body { padding-bottom: 70px; } </div><!-- /.bs-example --> {% highlight html %} <div class="row"> - <div class="col col-lg-3"> + <div class="col-lg-3"> <a href="#" class="thumbnail"> <img data-src="holder.js/260x180" alt=""> </a> @@ -1794,7 +1794,7 @@ body { padding-bottom: 70px; } <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p> <div class="bs-example"> <div class="row"> - <div class="col col-lg-4"> + <div class="col-lg-4"> <div class="thumbnail"> <img data-src="holder.js/300x200" alt=""> <div class="caption"> @@ -1804,7 +1804,7 @@ body { padding-bottom: 70px; } </div> </div> </div> - <div class="col col-lg-4"> + <div class="col-lg-4"> <div class="thumbnail"> <img data-src="holder.js/300x200" alt=""> <div class="caption"> @@ -1814,7 +1814,7 @@ body { padding-bottom: 70px; } </div> </div> </div> - <div class="col col-lg-4"> + <div class="col-lg-4"> <div class="thumbnail"> <img data-src="holder.js/300x200" alt=""> <div class="caption"> @@ -1828,7 +1828,7 @@ body { padding-bottom: 70px; } </div><!-- /.bs-example --> {% highlight html %} <div class="row"> - <div class="col col-lg-3"> + <div class="col-lg-3"> <div class="thumbnail"> <img data-src="holder.js/300x200" alt=""> <div class="caption"> |