diff options
author | Mark Otto <markd.otto@gmail.com> | 2020-06-13 00:26:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-13 00:26:37 +0300 |
commit | 286f16b92c546b96e1aadfb8cae409c34f036087 (patch) | |
tree | 76438da50e9f81e3d86e3d48760cc828b9417bd6 /scss | |
parent | 594e5fd07175baf796c03c1de755ee021e5b4c5d (diff) |
v5: Redo blockquote attributions (#30814)
* v5: Redo blockquote attributions
- Renames -small-* variables to -footer-*
- Updates blockquote demos with attribution to place it outside the blockquote with a figure wrapper
* Updated class name
* docs(examples): refactor blockquotes in masonry example
Co-authored-by: Gaƫl Poupard <gael.poupard@orange.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Diffstat (limited to 'scss')
-rw-r--r-- | scss/_type.scss | 13 | ||||
-rw-r--r-- | scss/_variables.scss | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index efa2c81552..b2d524ca14 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -84,14 +84,19 @@ // Blockquotes .blockquote { - margin-bottom: $spacer; + margin-bottom: $blockquote-margin-y; @include font-size($blockquote-font-size); + + > :last-child { + margin-bottom: 0; + } } .blockquote-footer { - display: block; - @include font-size($blockquote-small-font-size); - color: $blockquote-small-color; + margin-top: -$blockquote-margin-y; + margin-bottom: $blockquote-margin-y; + @include font-size($blockquote-footer-font-size); + color: $blockquote-footer-color; &::before { content: "\2014\00A0"; // em dash, nbsp diff --git a/scss/_variables.scss b/scss/_variables.scss index 2af7461a00..2e0d0cef67 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -447,9 +447,10 @@ $text-muted: $gray-600 !default; $initialism-font-size: $small-font-size !default; -$blockquote-small-color: $gray-600 !default; -$blockquote-small-font-size: $small-font-size !default; +$blockquote-margin-y: $spacer !default; $blockquote-font-size: $font-size-base * 1.25 !default; +$blockquote-footer-color: $gray-600 !default; +$blockquote-footer-font-size: $small-font-size !default; $hr-margin-y: $spacer !default; $hr-color: inherit !default; |