diff options
Diffstat (limited to 'assets/scss/_primer/markdown')
| -rw-r--r-- | assets/scss/_primer/markdown/blob-csv.scss | 4 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/code.scss | 5 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/headings.scss | 8 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/images.scss | 7 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/lists.scss | 23 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/markdown-body.scss | 8 | ||||
| -rw-r--r-- | assets/scss/_primer/markdown/tables.scss | 12 |
7 files changed, 38 insertions, 29 deletions
diff --git a/assets/scss/_primer/markdown/blob-csv.scss b/assets/scss/_primer/markdown/blob-csv.scss index e97e447..be7d257 100644 --- a/assets/scss/_primer/markdown/blob-csv.scss +++ b/assets/scss/_primer/markdown/blob-csv.scss @@ -15,7 +15,7 @@ // stylelint-disable-next-line primer/spacing padding: 10px $spacer-2 9px; text-align: right; - background: $bg-white; + background: var(--color-bg-primary); border: 0; } @@ -23,7 +23,7 @@ th { font-weight: $font-weight-bold; - background: $bg-gray; + background: var(--color-bg-tertiary); border-top: 0; } } diff --git a/assets/scss/_primer/markdown/code.scss b/assets/scss/_primer/markdown/code.scss index fbd2d16..5ed6a6c 100644 --- a/assets/scss/_primer/markdown/code.scss +++ b/assets/scss/_primer/markdown/code.scss @@ -8,8 +8,7 @@ margin: 0; // stylelint-disable-next-line primer/typography font-size: 85%; - // stylelint-disable-next-line primer/colors - background-color: rgba($black, 0.05); + background-color: var(--color-markdown-code-bg); border-radius: $border-radius; br { display: none; } @@ -50,7 +49,7 @@ font-size: 85%; // stylelint-disable-next-line primer/typography line-height: 1.45; - background-color: $bg-gray; + background-color: var(--color-bg-tertiary); border-radius: $border-radius; } diff --git a/assets/scss/_primer/markdown/headings.scss b/assets/scss/_primer/markdown/headings.scss index 26347bb..3cd86e9 100644 --- a/assets/scss/_primer/markdown/headings.scss +++ b/assets/scss/_primer/markdown/headings.scss @@ -15,7 +15,7 @@ line-height: $lh-condensed; .octicon-link { - color: $text-black; + color: var(--color-text-primary); vertical-align: middle; visibility: hidden; } @@ -39,7 +39,7 @@ padding-bottom: 0.3em; // stylelint-disable-next-line primer/typography font-size: 2em; - border-bottom: $border-width $border-style $border-gray-light; + border-bottom: $border-width $border-style var(--color-border-secondary); } h2 { @@ -47,7 +47,7 @@ padding-bottom: 0.3em; // stylelint-disable-next-line primer/typography font-size: 1.5em; - border-bottom: $border-width $border-style $border-gray-light; + border-bottom: $border-width $border-style var(--color-border-secondary); } h3 { @@ -67,6 +67,6 @@ h6 { // stylelint-disable-next-line primer/typography font-size: 0.85em; - color: $text-gray-light; + color: var(--color-text-tertiary); } } diff --git a/assets/scss/_primer/markdown/images.scss b/assets/scss/_primer/markdown/images.scss index caea502..3efb011 100644 --- a/assets/scss/_primer/markdown/images.scss +++ b/assets/scss/_primer/markdown/images.scss @@ -8,7 +8,7 @@ // because we put padding on the images to hide header lines, and some people // specify the width of their images in their markdown. box-sizing: content-box; - background-color: $bg-white; + background-color: var(--color-bg-primary); &[align=right] { // stylelint-disable-next-line primer/spacing @@ -44,8 +44,7 @@ // stylelint-disable-next-line primer/spacing margin: 13px 0 0; overflow: hidden; - // stylelint-disable-next-line primer/borders - border: $border-width $border-style lighten($gray-300, 5%); + border: $border-width $border-style var(--color-markdown-frame-border); } span img { @@ -58,7 +57,7 @@ // stylelint-disable-next-line primer/spacing padding: 5px 0 0; clear: both; - color: $text-gray-dark; + color: var(--color-text-primary); } } diff --git a/assets/scss/_primer/markdown/lists.scss b/assets/scss/_primer/markdown/lists.scss index b680faf..f61233c 100644 --- a/assets/scss/_primer/markdown/lists.scss +++ b/assets/scss/_primer/markdown/lists.scss @@ -2,7 +2,6 @@ // stylelint-disable selector-no-qualifying-type // stylelint-disable selector-max-type .markdown-body { - // Lists, Blockquotes & Such ul, ol { @@ -15,6 +14,24 @@ } } + ol[type="1"] { + list-style-type: decimal; + } + + ol[type="a"] { + list-style-type: lower-alpha; + } + + ol[type="i"] { + list-style-type: lower-roman; + } + + // Reset <ol> style to decimal (HTML default) specifically for AsciiDoc + // <div><ol> construction (doesn't affect MarkDown) + div > ol:not([type]) { + list-style-type: decimal; + } + // Did someone complain about list spacing? Encourage them // to create the spacing with their markdown formatting. // List behavior should be controled by the markup, not the css. @@ -46,10 +63,6 @@ margin-bottom: 0; } - li { - word-wrap: break-all; - } - li > p { margin-top: $spacer-3; } diff --git a/assets/scss/_primer/markdown/markdown-body.scss b/assets/scss/_primer/markdown/markdown-body.scss index 6581f19..eb46ea8 100644 --- a/assets/scss/_primer/markdown/markdown-body.scss +++ b/assets/scss/_primer/markdown/markdown-body.scss @@ -45,7 +45,7 @@ // Link Colors .absent { - color: $text-red; + color: var(--color-text-danger); } .anchor { @@ -77,16 +77,16 @@ padding: 0; margin: $spacer-4 0; // stylelint-disable-next-line primer/colors - background-color: $gray-200; + background-color: var(--color-border-primary); border: 0; } blockquote { // stylelint-disable-next-line primer/spacing padding: 0 1em; - color: $text-gray-light; + color: var(--color-text-tertiary); // stylelint-disable-next-line primer/borders - border-left: 0.25em $border-style lighten($gray-300, 5%); + border-left: 0.25em $border-style var(--color-markdown-blockquote-border); > :first-child { margin-top: 0; diff --git a/assets/scss/_primer/markdown/tables.scss b/assets/scss/_primer/markdown/tables.scss index 5e1e0bd..83a1a9f 100644 --- a/assets/scss/_primer/markdown/tables.scss +++ b/assets/scss/_primer/markdown/tables.scss @@ -2,7 +2,7 @@ // stylelint-disable selector-max-type .markdown-body { // Tables - table:not(.highlight) { + table { display: block; width: 100%; // keep for backwards compatibility width: max-content; @@ -17,17 +17,15 @@ td { // stylelint-disable-next-line primer/spacing padding: 6px 13px; - // stylelint-disable-next-line primer/borders - border: $border-width $border-style lighten($gray-300, 5%); + border: $border-width $border-style var(--color-markdown-table-border); } tr { - background-color: $bg-white; - // stylelint-disable-next-line primer/borders - border-top: $border-width $border-style darken($gray-300, 4%); + background-color: var(--color-bg-primary); + border-top: $border-width $border-style var(--color-markdown-table-tr-border); &:nth-child(2n) { - background-color: $bg-gray; + background-color: var(--color-bg-tertiary); } } |