Merge 4da5110 into 60efc29

chriskuehl · Oct 12, 2019 · 9d05970 · 9d05970
2 parents 60efc29 + 4da5110
commit 9d05970
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/fluffy/static/scss/app.scss b/fluffy/static/scss/app.scss
@@ -43,7 +43,7 @@ p.error {
     }
 }
 
-h1, h2, h3, h4, h5, p {
+h1, h2, h3, h4, h5, p, table {
     margin-bottom: 10px;
 }
 

diff --git a/fluffy/static/scss/markdown.scss b/fluffy/static/scss/markdown.scss
@@ -87,4 +87,14 @@ $source-code-font: 'Source Code Pro', monospace;
             padding-left: 5px;
         }
     }
+
+    td, th {
+        border: solid 1px #ddd;
+        padding: 8px;
+    }
+
+    th {
+        font-weight: bold;
+        background-color: #f1f1f1;
+    }
 }
diff --git a/testing/files/markdown.md b/testing/files/markdown.md
@@ -164,6 +164,22 @@ Instead of overwriting an entire config file just to change one value, try to
 3. Better monitoring of puppet runs (e.g. to see when a server has not updated
    recently, which is a common problem on desktops)
 
+## Some tables!
+
+table one:
+
+| Command | Description |
+| --- | --- |
+| `git status` | List all *new or modified* files |
+| `git diff` | Show file differences that **haven't been** staged |
+
+table 2:
+
+| Left-aligned | Center-aligned | Right-aligned |
+| :---         |     :---:      |          ---: |
+| git status   | git status     | git status    |
+| git diff     | git diff       | git diff      |
+
 [puppet]: https://en.wikipedia.org/wiki/Puppet_(software)
 [ocf]: https://www.ocf.berkeley.edu/
 [debian]: https://www.debian.org/