Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-08-19 03:42:50 +0400
committerMark Otto <markotto@twitter.com>2012-08-19 03:42:50 +0400
commit9ae137aede2ec2664793c3d67c99c81188f1c6f5 (patch)
treec015af95a73cf0fc41e2d0f05eb0b06aa5c7a574 /docs/templates/pages
parent80ced60778404462a83f70ea2192152e3dd4ffbc (diff)
modifications to new content
Diffstat (limited to 'docs/templates/pages')
-rw-r--r--docs/templates/pages/base-css.mustache39
1 files changed, 21 insertions, 18 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index f2fb96b4bb..d80dec813b 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -343,18 +343,21 @@
<h2>Inline</h2>
<p>Wrap inline snippets of code with <code>&lt;code&gt;</code>.</p>
+<div class="bs-docs-example">
+ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
+</div>
<pre class="prettyprint linenums">
-{{_i}}For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.{{/i}}
+{{_i}}For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inline.{{/i}}
</pre>
<h2>Basic block</h2>
<p>{{_i}}Use <code>&lt;pre&gt;</code> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.{{/i}}</p>
-<pre>
-&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;
-</pre>
+<div class="bs-docs-example">
+ <pre>&lt;p&gt;{{_i}}Sample text here...{{/i}}&lt;/p&gt;</pre>
+</div>
<pre class="prettyprint linenums" style="margin-bottom: 9px;">
&lt;pre&gt;
-&amp;lt;p&amp;gt;{{_i}}Sample text here...{{/i}}&amp;lt;/p&amp;gt;
+ &amp;lt;p&amp;gt;{{_i}}Sample text here...{{/i}}&amp;lt;/p&amp;gt;
&lt;/pre&gt;
</pre>
<p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Be sure to keep code within <code>&lt;pre&gt;</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">
&lt;table&gt;
- &lt;caption&gt;…&lt;/caption&gt;
+ &lt;caption&gt;...&lt;/caption&gt;
&lt;thead&gt;
&lt;tr&gt;
- &lt;th&gt;…&lt;/th&gt;
- &lt;th&gt;…&lt;/th&gt;
+ &lt;th&gt;...&lt;/th&gt;
+ &lt;th&gt;...&lt;/th&gt;
&lt;/tr&gt;
&lt;/thead&gt;
&lt;tbody&gt;
&lt;tr&gt;
- &lt;td&gt;…&lt;/td&gt;
- &lt;td&gt;…&lt;/td&gt;
+ &lt;td&gt;...&lt;/td&gt;
+ &lt;td&gt;...&lt;/td&gt;
&lt;/tr&gt;
&lt;/tbody&gt;
&lt;/table&gt;
@@ -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">
&lt;select&gt;
- &lt;option&gt;something&lt;/option&gt;
+ &lt;option&gt;1&lt;/option&gt;
&lt;option&gt;2&lt;/option&gt;
&lt;option&gt;3&lt;/option&gt;
&lt;option&gt;4&lt;/option&gt;
@@ -1099,8 +1102,8 @@
&lt;button type="submit" class="btn"&gt;{{_i}}Search{{/i}}&lt;/button&gt;
&lt;/div&gt;
&lt;div class="input-prepend"&gt;
- &lt;input type="text" class="span2 search-query"&gt;
&lt;button type="submit" class="btn"&gt;{{_i}}Search{{/i}}&lt;/button&gt;
+ &lt;input type="text" class="span2 search-query"&gt;
&lt;/div&gt;
&lt;/form&gt;
</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>&lt;img&gt;</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>&lt;img&gt;</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 @@
&lt;img src="..." class="img-circle"&gt;
&lt;img src="..." class="img-polaroid"&gt;
</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 @@
&lt;/div&gt;
</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 @@
&lt;/div&gt;
</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 }}