Skip to content

Commit

Permalink
Merge code page with reboot
Browse files Browse the repository at this point in the history
  • Loading branch information
MartijnCuppens committed Jul 25, 2019
1 parent 97edf94 commit ea34b6c
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 61 deletions.
1 change: 0 additions & 1 deletion scss/bootstrap.scss
Expand Up @@ -19,7 +19,6 @@
@import "reboot";
@import "type";
@import "images";
@import "code";
@import "grid";
@import "tables";
@import "forms";
Expand Down
50 changes: 0 additions & 50 deletions site/content/docs/4.3/content/code.md

This file was deleted.

49 changes: 40 additions & 9 deletions site/content/docs/4.3/content/reboot.md
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion site/data/nav.yml
Expand Up @@ -21,7 +21,6 @@
pages:
- title: Reboot
- title: Typography
- title: Code
- title: Images
- title: Tables
- title: Figures
Expand Down

0 comments on commit ea34b6c

Please sign in to comment.