diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-06-28 15:04:59 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-06-28 15:04:59 -0400 |
| commit | 730dcf5e7ab2190e0c67aa98bbdd19cee6319728 (patch) | |
| tree | b717f9cd13dbeed5750e853bcda63b77cc28d615 | |
| parent | 5a6d2838ed7c040e07f987b75cc62fadca0925e1 (diff) | |
Fix up styling on definition lists.
Also a minor list-structure issue in Pull requests.
| -rw-r--r-- | static/media/css/grimoire.css | 8 | ||||
| -rw-r--r-- | wiki/git/pull-request-workflow.md | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/static/media/css/grimoire.css b/static/media/css/grimoire.css index 3bf8257..96105e1 100644 --- a/static/media/css/grimoire.css +++ b/static/media/css/grimoire.css @@ -79,6 +79,7 @@ h1, h2, h3, h4, h5, h6 { #article pre, #article ul, #article ol, +#article dl, #listing ul { margin-bottom: 15px; } @@ -101,7 +102,12 @@ h1, h2, h3, h4, h5, h6 { } #article ul, -#article ol { +#article ol, +#article dl { + padding-left: 40px; +} + +#article dd { padding-left: 40px; } diff --git a/wiki/git/pull-request-workflow.md b/wiki/git/pull-request-workflow.md index ca6cae2..900c45b 100644 --- a/wiki/git/pull-request-workflow.md +++ b/wiki/git/pull-request-workflow.md @@ -9,6 +9,7 @@ I use a couple of naming conventions here that are not stock `git`: origin : The repository to which you _publish_ proposed changes + upstream : The repository from which you receive ongoing development, and which will receive your changes. |