mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-30 07:19:13 +02:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of github.com:twitter/bootstrap into dev

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2011-10-31 23:22:13 -07:00
parent 98007b8394 8f726dc6ef
commit a21363a749
20 changed files with 549 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/index.html
View File

@@ -611,7 +611,7 @@
<tbody>
<tr>
<td><code>&lt;code&gt;</code></td>
<td>In a line of text like this, your wrapped code will look like this <code>&gt;html&lt;</code> element.</td>
<td>In a line of text like this, your wrapped code will look like this <code>&lt;html&gt;</code> element.</td>
</tr>
<tr>
<td><code>&lt;pre&gt;</code></td>
@@ -620,7 +620,7 @@
&lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here...&lt;/p&gt;
&lt;/div&gt;</pre>
<p><strong>Note:</strong> Be sure to keep code within <code>pre</code> tags as close to the left as possible; it will render all tabs.</p>
<p><strong>Note:</strong> Be sure to keep code within <code>&lt;pre&gt;</code> tags as close to the left as possible; it will render all tabs.</p>
</td>
</tr>
<tr>
@@ -2030,4 +2030,4 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<script src="assets/js/application.js"></script>
</body>
</html>
</html>