diff options
author | Suzanne Selhorn <sselhorn@gitlab.com> | 2021-02-20 07:51:05 +0300 |
---|---|---|
committer | Suzanne Selhorn <sselhorn@gitlab.com> | 2021-02-20 07:51:05 +0300 |
commit | c998936a3cb1cfb694316d24cac2c4c92a417764 (patch) | |
tree | 1206dc19875f314950e46412ee71d92d26b4ac1a | |
parent | 101f02fce37e0ddd00577184e269769b721f11b0 (diff) | |
parent | 0163a9d188662f76ba47b69871713ed2ac7dd507 (diff) |
Merge branch '941' into 'master'
Fix blockquote spacing issues
See merge request gitlab-org/gitlab-docs!1534
-rw-r--r-- | content/assets/stylesheets/stylesheet.scss | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss index 86ff1738..b78941fd 100644 --- a/content/assets/stylesheets/stylesheet.scss +++ b/content/assets/stylesheets/stylesheet.scss @@ -1,5 +1,5 @@ --- -version: 98 +version: 99 --- @import "variables"; @@ -111,17 +111,27 @@ blockquote { color: $blockquote-txt-color; border: solid 1px $blockquote-border-color; border-radius: 5px; - margin: 20px 0; - padding: 10px 20px; + margin: 1rem 0; + padding: 0 1rem; font-size: $body-font-size; .highlight { background-color: $white; } + + p:first-child { + margin-top: 1rem; + } + // Override bootstrap ol:last-child, p:last-child, ul:last-child { margin: inherit; + + li { + line-height: 1rem; + padding-top: .5rem; + } } } @@ -342,7 +352,7 @@ h6 { li { &:not(.gl-breadcrumb-item) { line-height: 1.6em; - padding-bottom: 8px; + padding-bottom: .5rem; ul li:first-of-type { padding-top: 12px; } |