Merge code page with reboot

diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index df1d49e2ad5e9db9f72cae706b6b53b2b78a9021..84745b5d19ee1eb89839e6e1f70d5568fda09078 100644 (file)
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -19,7 +19,6 @@
 @import "reboot";
 @import "type";
 @import "images";
-@import "code";
 @import "grid";
 @import "tables";
 @import "forms";

diff --git a/site/content/docs/4.3/content/code.md b/site/content/docs/4.3/content/code.md
deleted file mode 100644 (file)
index 1e022f3..0000000
--- a/site/content/docs/4.3/content/code.md
+++ /dev/null
@@ -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 >}}

diff --git a/site/content/docs/4.3/content/reboot.md b/site/content/docs/4.3/content/reboot.md
index 00e914a344fa6b84181910dc1f0fa6d83a961d4a..04d9f878c0ced61e58fb589f622e13981c2a5094 100644 (file)
--- a/site/content/docs/4.3/content/reboot.md
+++ b/site/content/docs/4.3/content/reboot.md
@@ -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
 

diff --git a/site/data/nav.yml b/site/data/nav.yml
index 4431073a4c84d41fa2bcf667d12590516d10c833..205b95d7a35b231667135fe71fcd78388dd85f2d 100644 (file)
--- a/site/data/nav.yml
+++ b/site/data/nav.yml
@@ -21,7 +21,6 @@
   pages:
     - title: Reboot
     - title: Typography
-    - title: Code
     - title: Images
     - title: Tables
     - title: Figures