Skip to content

Instantly share code, notes, and snippets.

@yuya-takeyama
Last active February 9, 2016 10:28
Show Gist options
  • Save yuya-takeyama/03d98efacc4cb6411233 to your computer and use it in GitHub Desktop.
Save yuya-takeyama/03d98efacc4cb6411233 to your computer and use it in GitHub Desktop.
$ git diff v4.0.0-alpha v4.0.0-alpha.2 -- scss/_type.scss
diff --git a/scss/_type.scss b/scss/_type.scss
index 2f5cdb4..f770d20 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -4,29 +4,29 @@
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
+ margin-bottom: $headings-margin-bottom;
font-family: $headings-font-family;
font-weight: $headings-font-weight;
line-height: $headings-line-height;
color: $headings-color;
}
-h1, .h1,
-h2, .h2,
-h3, .h3 {
- margin-bottom: $headings-margin-bottom;
-}
-h4, .h4,
-h5, .h5,
-h6, .h6 {
- margin-bottom: $headings-margin-bottom;
-}
+h1 { font-size: $font-size-h1; }
+h2 { font-size: $font-size-h2; }
+h3 { font-size: $font-size-h3; }
+h4 { font-size: $font-size-h4; }
+h5 { font-size: $font-size-h5; }
+h6 { font-size: $font-size-h6; }
-h1, .h1 { font-size: $font-size-h1; }
-h2, .h2 { font-size: $font-size-h2; }
-h3, .h3 { font-size: $font-size-h3; }
-h4, .h4 { font-size: $font-size-h4; }
-h5, .h5 { font-size: $font-size-h5; }
-h6, .h6 { font-size: $font-size-h6; }
+// These declarations are kept separate from and placed after
+// the previous tag-based declarations so that the classes beat the tags in
+// the CSS cascade, and thus <h1 class="h2"> will be styled like an h2.
+.h1 { font-size: $font-size-h1; }
+.h2 { font-size: $font-size-h2; }
+.h3 { font-size: $font-size-h3; }
+.h4 { font-size: $font-size-h4; }
+.h5 { font-size: $font-size-h5; }
+.h6 { font-size: $font-size-h6; }
.lead {
font-size: $lead-font-size;
@@ -85,22 +85,19 @@ mark,
// Lists
//
-// Unstyled keeps list items block level, just removes default browser padding and list-style
.list-unstyled {
- padding-left: 0;
- list-style: none;
+ @include list-unstyled;
}
// Inline turns list items into inline-block
.list-inline {
- padding-left: 0;
- margin-left: -5px;
- list-style: none;
+ @include list-unstyled;
+}
+.list-inline-item {
+ display: inline-block;
- > li {
- display: inline-block;
- padding-right: 5px;
- padding-left: 5px;
+ &:not(:last-child) {
+ margin-right: $list-inline-padding;
}
}
@@ -128,24 +125,16 @@ mark,
margin-bottom: $spacer;
font-size: $blockquote-font-size;
border-left: .25rem solid $blockquote-border-color;
+}
- p,
- ul,
- ol {
- &:last-child {
- margin-bottom: 0;
- }
- }
-
- footer {
- display: block;
- font-size: 80%; // back to default font-size
- line-height: $line-height;
- color: $blockquote-small-color;
+.blockquote-footer {
+ display: block;
+ font-size: 80%; // back to default font-size
+ line-height: $line-height;
+ color: $blockquote-small-color;
- &:before {
- content: "\2014 \00A0"; // em dash, nbsp
- }
+ &::before {
+ content: "\2014 \00A0"; // em dash, nbsp
}
}
@@ -156,32 +145,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
- }
- }
}
-//
-// Figures
-//
-
-.figure {
- // Ensures the caption's text aligns with the image.
- display: inline-block;
-
- > img {
- @extend .img-responsive;
- line-height: 1;
- margin-bottom: ($spacer-y / 2);
+.blockquote-reverse .blockquote-footer {
+ &::before {
+ content: "";
+ }
+ &::after {
+ content: "\00A0 \2014"; // nbsp, em dash
}
-}
-
-.figure-caption {
- font-size: 90%;
- color: $gray-light;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment