mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
modifications to new content
This commit is contained in:
parent
80ced60778
commit
9ae137aede
@ -406,18 +406,21 @@
|
||||
|
||||
<h2>Inline</h2>
|
||||
<p>Wrap inline snippets of code with <code><code></code>.</p>
|
||||
<div class="bs-docs-example">
|
||||
For example, <code><section></code> should be wrapped as inline.
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
For example, <code>section</code> should be wrapped as inline.
|
||||
For example, <code><section></code> should be wrapped as inline.
|
||||
</pre>
|
||||
|
||||
<h2>Basic block</h2>
|
||||
<p>Use <code><pre></code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.</p>
|
||||
<pre>
|
||||
<p>Sample text here...</p>
|
||||
</pre>
|
||||
<div class="bs-docs-example">
|
||||
<pre><p>Sample text here...</p></pre>
|
||||
</div>
|
||||
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
|
||||
<pre>
|
||||
&lt;p&gt;Sample text here...&lt;/p&gt;
|
||||
&lt;p&gt;Sample text here...&lt;/p&gt;
|
||||
</pre>
|
||||
</pre>
|
||||
<p><span class="label label-info">Heads up!</span> Be sure to keep code within <code><pre></code> tags as close to the left as possible; it will render all tabs.</p>
|
||||
@ -802,17 +805,17 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
</table>
|
||||
<pre class="prettyprint linenums">
|
||||
<table>
|
||||
<caption>…</caption>
|
||||
<caption>...</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>…</th>
|
||||
<th>…</th>
|
||||
<th>...</th>
|
||||
<th>...</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>…</td>
|
||||
<td>…</td>
|
||||
<td>...</td>
|
||||
<td>...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -1040,7 +1043,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<p>Use the default option or specify a <code>multiple="multiple"</code> to show multiple options at once.</p>
|
||||
<form class="bs-docs-example">
|
||||
<select>
|
||||
<option>something</option>
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
@ -1057,7 +1060,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
</form>
|
||||
<pre class="prettyprint linenums">
|
||||
<select>
|
||||
<option>something</option>
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
@ -1162,8 +1165,8 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<button type="submit" class="btn">Search</button>
|
||||
</div>
|
||||
<div class="input-prepend">
|
||||
<input type="text" class="span2 search-query">
|
||||
<button type="submit" class="btn">Search</button>
|
||||
<input type="text" class="span2 search-query">
|
||||
</div>
|
||||
</form>
|
||||
</pre>
|
||||
@ -1567,8 +1570,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<h1>Images</h1>
|
||||
</div>
|
||||
|
||||
<p>Add the <code>.img-rounded</code>, <code>.img-circle</code> or <code>.img-polaroid</code> class to a <code><img></code> element to easily style images in any project.</p>
|
||||
<p><span class="label label-info">Heads up!</span> <code>.img-rounded</code> and <code>.img-circle</code> don't work in IE7-8.</p>
|
||||
<p>Add classes to an <code><img></code> element to easily style images in any project.</p>
|
||||
<div class="bs-docs-example bs-docs-example-images">
|
||||
<img src="http://placehold.it/140x140" class="img-rounded">
|
||||
<img src="http://placehold.it/140x140" class="img-circle">
|
||||
@ -1579,6 +1581,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<img src="..." class="img-circle">
|
||||
<img src="..." class="img-polaroid">
|
||||
</pre>
|
||||
<p><span class="label label-info">Heads up!</span> <code>.img-rounded</code> and <code>.img-circle</code> do not work in IE7-8 due to lack of <code>border-radius</code> support.</p>
|
||||
|
||||
|
||||
</section>
|
||||
@ -1771,7 +1774,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
|
||||
<h4>Buttons</h4>
|
||||
|
||||
<h6>Button group in a button toolbar</h6>
|
||||
<h5>Button group in a button toolbar</h5>
|
||||
<div class="bs-docs-example">
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
@ -1794,7 +1797,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
<h6>Dropdown in a button group</h6>
|
||||
<h5>Dropdown in a button group</h5>
|
||||
<div class="bs-docs-example">
|
||||
<div class="btn-group">
|
||||
<a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> User</a>
|
||||
@ -1822,7 +1825,7 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
<h6>Button</h6>
|
||||
<h5>Small button</h5>
|
||||
<div class="bs-docs-example">
|
||||
<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
|
||||
</div>
|
||||
|
39
docs/templates/pages/base-css.mustache
vendored
39
docs/templates/pages/base-css.mustache
vendored
@ -343,18 +343,21 @@
|
||||
|
||||
<h2>Inline</h2>
|
||||
<p>Wrap inline snippets of code with <code><code></code>.</p>
|
||||
<div class="bs-docs-example">
|
||||
For example, <code><section></code> should be wrapped as inline.
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
{{_i}}For example, <code>section</code> should be wrapped as inline.{{/i}}
|
||||
{{_i}}For example, <code><section></code> should be wrapped as inline.{{/i}}
|
||||
</pre>
|
||||
|
||||
<h2>Basic block</h2>
|
||||
<p>{{_i}}Use <code><pre></code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}</p>
|
||||
<pre>
|
||||
<p>{{_i}}Sample text here...{{/i}}</p>
|
||||
</pre>
|
||||
<div class="bs-docs-example">
|
||||
<pre><p>{{_i}}Sample text here...{{/i}}</p></pre>
|
||||
</div>
|
||||
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
|
||||
<pre>
|
||||
&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
|
||||
&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
|
||||
</pre>
|
||||
</pre>
|
||||
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Be sure to keep code within <code><pre></code> tags as close to the left as possible; it will render all tabs.{{/i}}</p>
|
||||
@ -739,17 +742,17 @@
|
||||
</table>
|
||||
<pre class="prettyprint linenums">
|
||||
<table>
|
||||
<caption>…</caption>
|
||||
<caption>...</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>…</th>
|
||||
<th>…</th>
|
||||
<th>...</th>
|
||||
<th>...</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>…</td>
|
||||
<td>…</td>
|
||||
<td>...</td>
|
||||
<td>...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -977,7 +980,7 @@
|
||||
<p>{{_i}}Use the default option or specify a <code>multiple="multiple"</code> to show multiple options at once.{{/i}}</p>
|
||||
<form class="bs-docs-example">
|
||||
<select>
|
||||
<option>something</option>
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
@ -994,7 +997,7 @@
|
||||
</form>
|
||||
<pre class="prettyprint linenums">
|
||||
<select>
|
||||
<option>something</option>
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
@ -1099,8 +1102,8 @@
|
||||
<button type="submit" class="btn">{{_i}}Search{{/i}}</button>
|
||||
</div>
|
||||
<div class="input-prepend">
|
||||
<input type="text" class="span2 search-query">
|
||||
<button type="submit" class="btn">{{_i}}Search{{/i}}</button>
|
||||
<input type="text" class="span2 search-query">
|
||||
</div>
|
||||
</form>
|
||||
</pre>
|
||||
@ -1504,8 +1507,7 @@
|
||||
<h1>{{_i}}Images{{/i}}</h1>
|
||||
</div>
|
||||
|
||||
<p>{{_i}}Add the <code>.img-rounded</code>, <code>.img-circle</code> or <code>.img-polaroid</code> class to a <code><img></code> element to easily style images in any project.{{/i}}</p>
|
||||
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}<code>.img-rounded</code> and <code>.img-circle</code> don't work in IE7-8.{{/i}}</p>
|
||||
<p>{{_i}}Add classes to an <code><img></code> element to easily style images in any project.{{/i}}</p>
|
||||
<div class="bs-docs-example bs-docs-example-images">
|
||||
<img src="http://placehold.it/140x140" class="img-rounded">
|
||||
<img src="http://placehold.it/140x140" class="img-circle">
|
||||
@ -1516,6 +1518,7 @@
|
||||
<img src="..." class="img-circle">
|
||||
<img src="..." class="img-polaroid">
|
||||
</pre>
|
||||
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}<code>.img-rounded</code> and <code>.img-circle</code> do not work in IE7-8 due to lack of <code>border-radius</code> support.{{/i}}</p>
|
||||
|
||||
|
||||
</section>
|
||||
@ -1708,7 +1711,7 @@
|
||||
|
||||
<h4>{{_i}}Buttons{{/i}}</h4>
|
||||
|
||||
<h6>{{_i}}Button group in a button toolbar{{/i}}</h6>
|
||||
<h5>{{_i}}Button group in a button toolbar{{/i}}</h5>
|
||||
<div class="bs-docs-example">
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
@ -1731,7 +1734,7 @@
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
<h6>{{_i}}Dropdown in a button group{{/i}}</h6>
|
||||
<h5>{{_i}}Dropdown in a button group{{/i}}</h5>
|
||||
<div class="bs-docs-example">
|
||||
<div class="btn-group">
|
||||
<a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> {{_i}}User{{/i}}</a>
|
||||
@ -1759,7 +1762,7 @@
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
<h6>{{_i}}Button{{/i}}</h6>
|
||||
<h5>{{_i}}Small button{{/i}}</h5>
|
||||
<div class="bs-docs-example">
|
||||
<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
|
||||
</div>{{! /bs-docs-example }}
|
||||
|
Loading…
x
Reference in New Issue
Block a user