diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /scss/_type.scss | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'scss/_type.scss')
| -rw-r--r-- | scss/_type.scss | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index 2f5cdb4f9..597886db3 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -143,7 +143,7 @@ mark, line-height: $line-height; color: $blockquote-small-color; - &:before { + &::before { content: "\2014 \00A0"; // em dash, nbsp } } @@ -159,8 +159,8 @@ mark, // Account for citation footer { - &:before { content: ""; } - &:after { + &::before { content: ""; } + &::after { content: "\00A0 \2014"; // nbsp, em dash } } @@ -175,9 +175,9 @@ mark, display: inline-block; > img { - @extend .img-responsive; - line-height: 1; + @extend .img-fluid; margin-bottom: ($spacer-y / 2); + line-height: 1; } } |