0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Merge code page with reboot

This commit is contained in:
Martijn Cuppens 2019-07-25 18:01:41 +02:00
parent 97edf94c11
commit ea34b6c5be
4 changed files with 40 additions and 61 deletions

1
scss/bootstrap.scss vendored
View File

@ -19,7 +19,6 @@
@import "reboot";
@import "type";
@import "images";
@import "code";
@import "grid";
@import "tables";
@import "forms";

View File

@ -1,50 +0,0 @@
---
layout: docs
title: Code
description: Documentation and examples for displaying inline and multiline blocks of code with Bootstrap.
group: content
toc: true
---
## Inline code
Wrap inline snippets of code with `<code>`. Be sure to escape HTML angle brackets.
{{< example >}}
For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{{< /example >}}
## 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.
{{< example >}}
<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>
{{< /example >}}
## Variables
For indicating variables use the `<var>` tag.
{{< example >}}
<var>y</var> = <var>m</var><var>x</var> + <var>b</var>
{{< /example >}}
## User input
Use the `<kbd>` to indicate input that is typically entered via keyboard.
{{< example >}}
To switch directories, type <kbd>cd</kbd> followed by the name of the directory.<br>
To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
{{< /example >}}
## Sample output
For indicating sample output from a program use the `<samp>` tag.
{{< example >}}
<samp>This text is meant to be treated as sample output from a computer program.</samp>
{{< /example >}}

View File

@ -144,17 +144,48 @@ For simpler styling, clear hierarchy, and better spacing, description lists have
</dl>
</div>
## Preformatted text
## Inline code
The `<pre>` element is reset to remove its `margin-top` and use `rem` units for its `margin-bottom`.
Wrap inline snippets of code with `<code>`. Be sure to escape HTML angle brackets.
<div class="bd-example">
<pre>
.example-element {
margin-bottom: 1rem;
}
</pre>
</div>
{{< example >}}
For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{{< /example >}}
## 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. The `<pre>` element is reset to remove its `margin-top` and use `rem` units for its `margin-bottom`.
{{< example >}}
<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>
{{< /example >}}
## Variables
For indicating variables use the `<var>` tag.
{{< example >}}
<var>y</var> = <var>m</var><var>x</var> + <var>b</var>
{{< /example >}}
## User input
Use the `<kbd>` to indicate input that is typically entered via keyboard.
{{< example >}}
To switch directories, type <kbd>cd</kbd> followed by the name of the directory.<br>
To edit settings, press <kbd><kbd>ctrl</kbd> + <kbd>,</kbd></kbd>
{{< /example >}}
## Sample output
For indicating sample output from a program use the `<samp>` tag.
{{< example >}}
<samp>This text is meant to be treated as sample output from a computer program.</samp>
{{< /example >}}
## Tables

View File

@ -21,7 +21,6 @@
pages:
- title: Reboot
- title: Typography
- title: Code
- title: Images
- title: Tables
- title: Figures