diff --git a/assets/styles/layouts/_layout-article.scss b/assets/styles/layouts/_layout-article.scss index aebdc5a49..9f07fbe24 100644 --- a/assets/styles/layouts/_layout-article.scss +++ b/assets/styles/layouts/_layout-article.scss @@ -12,6 +12,9 @@ a { color: inherit !important; text-decoration: none; + code:after { + border: none; + } } } h1 { @@ -34,24 +37,24 @@ h4 { font-size: 1.25rem; font-style: italic; - margin: -1.5rem 0 .5rem; + margin: -1.25rem 0 .5rem; padding-top: 1.75rem; } h5 { font-size: 1rem; - margin: -1.5rem 0 .25rem; + margin: -1.25rem 0 .25rem; padding-top: 1.75rem; } h6 { font-size: 1rem; font-style: italic; - margin: -1.5rem 0 .25rem; + margin: -1.25rem 0 .25rem; padding-top: 1.75rem; } p,li { color: $article-text; - line-height: 1.5rem; + line-height: 1.6rem; } p { @@ -97,6 +100,9 @@ ul { list-style-type: disc; + li:before{ + content: "" !important; + } } ol { @@ -112,11 +118,19 @@ color: $article-bold; font-weight: bold; } + ul { + counter-reset: item; + } } } + & > ol, + & > ul { + margin: 1rem 0 1.5rem 0; + } + li { - margin: .2rem 0; + margin: .25rem 0; } //////////////////////////////////// Code //////////////////////////////////// @@ -247,6 +261,10 @@ background: $article-note-table-row-alt; } } + blockquote { + border-color: rgba($article-note-text, .25); + p { color: rgba($article-note-text, .6); } + } } .warn { @@ -287,6 +305,10 @@ background: $article-warn-table-row-alt; } } + blockquote { + border-color: rgba($article-warn-text, .25); + p { color: rgba($article-warn-text, .6); } + } } ///////////////////////////////// Enterprise ///////////////////////////////// diff --git a/assets/styles/layouts/_layout-sidebar.scss b/assets/styles/layouts/_layout-sidebar.scss index e343cf6e9..90dc5f3a3 100644 --- a/assets/styles/layouts/_layout-sidebar.scss +++ b/assets/styles/layouts/_layout-sidebar.scss @@ -21,7 +21,7 @@ background: $article-bg; border-radius: $border-radius; border: 1px solid $search-border; - padding: .5em; + padding: .5em 2.15rem .5rem .5rem; width: 100%; color: $article-text; transition-property: border, box-shadow; diff --git a/assets/styles/themes/_theme-light.scss b/assets/styles/themes/_theme-light.scss index 33bf916b0..bad36b790 100644 --- a/assets/styles/themes/_theme-light.scss +++ b/assets/styles/themes/_theme-light.scss @@ -30,7 +30,7 @@ $search-highlight: $b-pool; // Article Content $article-bg: $g20-white; -$article-heading: $g6-smoke; +$article-heading: $g7-graphite; $article-text: $g8-storm; $article-bold: $g8-storm; $article-link: $b-ocean; diff --git a/content/v2.0/example.md b/content/v2.0/example.md index 9d16076a7..6cce26114 100644 --- a/content/v2.0/example.md +++ b/content/v2.0/example.md @@ -165,6 +165,11 @@ Etiam tristique nisi et tristique auctor. Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. +> Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. +> Etiam tristique nisi et tristique auctor. +> Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. +> Etiam tristique nisi et tristique auctor. + #### Inline Styles This is an [inline link](#). This is `inline code`. This is an [`inline code link`](#) . @@ -271,6 +276,11 @@ Etiam tristique nisi et tristique auctor. Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. Etiam tristique nisi et tristique auctor. +> Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. +> Etiam tristique nisi et tristique auctor. +> Nunc rutrum, metus id scelerisque euismod, erat ante, ac congue enim risus id est. +> Etiam tristique nisi et tristique auctor. + #### Inline Styles This is an [inline link](#). This is `inline code`. This is an [`inline code link`](#) .