]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #18138 from bassjobsen/patch-12
authorMark Otto <markd.otto@gmail.com>
Tue, 8 Dec 2015 07:32:31 +0000 (23:32 -0800)
committerMark Otto <markd.otto@gmail.com>
Tue, 8 Dec 2015 07:32:31 +0000 (23:32 -0800)
 refactor blockqoutes to to avoid tag selectors & child selectors

1  2 
docs/content/typography.md
scss/_type.scss

Simple merge
diff --cc scss/_type.scss
index 35780d39e953818bc75b7187193f1404bb9f1a78,f6fcd07b21b485282eb3e6b3fcc7048a117f95cd..da286e53a7fa27c4814ddb3e7a3db916a51dddb1
@@@ -153,12 -161,33 +153,13 @@@ mark
    text-align: right;
    border-right: .25rem solid $blockquote-border-color;
    border-left: 0;
+ }
  
-   // Account for citation
-   footer {
-     &::before { content: ""; }
-     &::after {
-       content: "\00A0 \2014"; // nbsp, em dash
-     }
+ .blockquote-reverse .blockquote-footer {
+   &::before {
+     content: "";
+   }
+   &::after {
+     content: "\00A0 \2014"; // nbsp, em dash
    }
  }
 -
 -//
 -// Figures
 -//
 -
 -.figure {
 -  // Ensures the caption's text aligns with the image.
 -  display: inline-block;
 -
 -  > img {
 -    @extend .img-fluid;
 -    margin-bottom: ($spacer-y / 2);
 -    line-height: 1;
 -  }
 -}
 -
 -.figure-caption {
 -  font-size: 90%;
 -  color: $gray-light;
 -}