0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00

Merge pull request #18675 from patrickhlauke/docs-code1

Docs: tweaks to content code
This commit is contained in:
Mark Otto 2016-01-03 19:03:26 -08:00
commit 16552b241c

View File

@ -13,18 +13,20 @@ Styles for inline code snippets and longer, multiline blocks of code.
## Inline code
Wrap inline snippets of code with `code`. Be sure to escape HTML angle brackets.
Wrap inline snippets of code with `<code>`. Be sure to escape HTML angle brackets.
{% example html %}
For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endexample %}
## Preformatted text
## Code blocks
Or, code blocks. Use `<pre>`s for multiple lines of code. Once again, be sure to escape any angle brackets in the code for proper rendering. You may optionally add the `.pre-scrollable` class, which will set a max-height of 350px and provide a y-axis scrollbar.
Use `<pre>`s for multiple lines of code. Once again, be sure to escape any angle brackets in the code for proper rendering. You may optionally add the `.pre-scrollable` class, which will set a max-height of 350px and provide a y-axis scrollbar.
{% example html %}
<pre>&lt;p&gt;Sample text here...&lt;/p&gt;</pre>
<pre><code>&lt;p&gt;Sample text here...&lt;/p&gt;
&lt;p&gt;And another line of sample text here...&lt;/p&gt;
</code></pre>
{% endexample %}
## Variables
@ -46,7 +48,7 @@ To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
## Sample output
For indicating blocks sample output from a program use the `<samp>` tag.
For indicating sample output from a program use the `<samp>` tag.
{% example html %}
<samp>This text is meant to be treated as sample output from a computer program.</samp>