diff options
Diffstat (limited to 'assets/stylesheets/bootstrap/_type.scss')
| -rw-r--r-- | assets/stylesheets/bootstrap/_type.scss | 281 |
1 files changed, 85 insertions, 196 deletions
diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss index a39a615..2f5cdb4 100644 --- a/assets/stylesheets/bootstrap/_type.scss +++ b/assets/stylesheets/bootstrap/_type.scss @@ -1,10 +1,6 @@ // -// Typography -// -------------------------------------------------- - - // Headings -// ------------------------- +// h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { @@ -12,36 +8,17 @@ h1, h2, h3, h4, h5, h6, font-weight: $headings-font-weight; line-height: $headings-line-height; color: $headings-color; - - small, - .small { - font-weight: normal; - line-height: 1; - color: $headings-small-color; - } } h1, .h1, h2, .h2, h3, .h3 { - margin-top: $line-height-computed; - margin-bottom: ($line-height-computed / 2); - - small, - .small { - font-size: 65%; - } + margin-bottom: $headings-margin-bottom; } h4, .h4, h5, .h5, h6, .h6 { - margin-top: ($line-height-computed / 2); - margin-bottom: ($line-height-computed / 2); - - small, - .small { - font-size: 75%; - } + margin-bottom: $headings-margin-bottom; } h1, .h1 { font-size: $font-size-h1; } @@ -51,198 +28,106 @@ h4, .h4 { font-size: $font-size-h4; } h5, .h5 { font-size: $font-size-h5; } h6, .h6 { font-size: $font-size-h6; } +.lead { + font-size: $lead-font-size; + font-weight: $lead-font-weight; +} -// Body text -// ------------------------- - -p { - margin: 0 0 ($line-height-computed / 2); +// Type display classes +.display-1 { + font-size: $display1-size; + font-weight: $display1-weight; +} +.display-2 { + font-size: $display2-size; + font-weight: $display2-weight; +} +.display-3 { + font-size: $display3-size; + font-weight: $display3-weight; +} +.display-4 { + font-size: $display4-size; + font-weight: $display4-weight; } -.lead { - margin-bottom: $line-height-computed; - font-size: floor(($font-size-base * 1.15)); - font-weight: 300; - line-height: 1.4; - @media (min-width: $screen-sm-min) { - font-size: ($font-size-base * 1.5); - } +// +// Horizontal rules +// + +hr { + margin-top: $spacer-y; + margin-bottom: $spacer-y; + border: 0; + border-top: $hr-border-width solid $hr-border-color; } -// Emphasis & misc -// ------------------------- +// +// Emphasis +// -// Ex: (12px small font / 14px base font) * 100% = about 85% small, .small { - font-size: floor((100% * $font-size-small / $font-size-base)); + font-size: 80%; + font-weight: normal; } mark, .mark { - background-color: $state-warning-bg; padding: .2em; -} - -// Alignment -.text-left { text-align: left; } -.text-right { text-align: right; } -.text-center { text-align: center; } -.text-justify { text-align: justify; } -.text-nowrap { white-space: nowrap; } - -// Transformation -.text-lowercase { text-transform: lowercase; } -.text-uppercase { text-transform: uppercase; } -.text-capitalize { text-transform: capitalize; } - -// Contextual colors -.text-muted { - color: $text-muted; -} - -@include text-emphasis-variant('.text-primary', $brand-primary); - -@include text-emphasis-variant('.text-success', $state-success-text); - -@include text-emphasis-variant('.text-info', $state-info-text); - -@include text-emphasis-variant('.text-warning', $state-warning-text); - -@include text-emphasis-variant('.text-danger', $state-danger-text); - -// Contextual backgrounds -// For now we'll leave these alongside the text classes until v4 when we can -// safely shift things around (per SemVer rules). -.bg-primary { - // Given the contrast here, this is the only class to have its color inverted - // automatically. - color: #fff; -} -@include bg-variant('.bg-primary', $brand-primary); - -@include bg-variant('.bg-success', $state-success-bg); - -@include bg-variant('.bg-info', $state-info-bg); - -@include bg-variant('.bg-warning', $state-warning-bg); - -@include bg-variant('.bg-danger', $state-danger-bg); - - -// Page header -// ------------------------- - -.page-header { - padding-bottom: (($line-height-computed / 2) - 1); - margin: ($line-height-computed * 2) 0 $line-height-computed; - border-bottom: 1px solid $page-header-border-color; + background-color: $state-warning-bg; } +// // Lists -// ------------------------- - -// Unordered and Ordered lists -ul, -ol { - margin-top: 0; - margin-bottom: ($line-height-computed / 2); - ul, - ol { - margin-bottom: 0; - } -} - -// List options +// -// [converter] extracted from `.list-unstyled` for libsass compatibility -@mixin list-unstyled { +// Unstyled keeps list items block level, just removes default browser padding and list-style +.list-unstyled { padding-left: 0; list-style: none; } -// [converter] extracted as `@mixin list-unstyled` for libsass compatibility -.list-unstyled { - @include list-unstyled; -} - // Inline turns list items into inline-block .list-inline { - @include list-unstyled; + padding-left: 0; margin-left: -5px; + list-style: none; > li { display: inline-block; - padding-left: 5px; padding-right: 5px; + padding-left: 5px; } } -// Description Lists -dl { - margin-top: 0; // Remove browser default - margin-bottom: $line-height-computed; -} -dt, -dd { - line-height: $line-height-base; -} -dt { - font-weight: bold; -} -dd { - margin-left: 0; // Undo browser default -} - -// Horizontal description lists -// -// Defaults to being stacked without any of the below styles applied, until the -// grid breakpoint is reached (default of ~768px). - +// Horizontal description lists w/ grid classes .dl-horizontal { - dd { - @include clearfix; // Clear the floated `dt` if an empty `dd` is present - } - - @media (min-width: $grid-float-breakpoint) { - dt { - float: left; - width: ($dl-horizontal-offset - 20); - clear: left; - text-align: right; - @include text-overflow; - } - dd { - margin-left: $dl-horizontal-offset; - } - } + margin-right: -$grid-gutter-width; + margin-left: -$grid-gutter-width; + @include clearfix; } +// // Misc -// ------------------------- +// -// Abbreviations and acronyms -abbr[title], -// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted $abbr-border-color; -} +// Builds on `abbr` .initialism { font-size: 90%; - @extend .text-uppercase; + text-transform: uppercase; } // Blockquotes -blockquote { - padding: ($line-height-computed / 2) $line-height-computed; - margin: 0 0 $line-height-computed; +.blockquote { + padding: ($spacer / 2) $spacer; + margin-bottom: $spacer; font-size: $blockquote-font-size; - border-left: 5px solid $blockquote-border-color; + border-left: .25rem solid $blockquote-border-color; p, ul, @@ -252,47 +137,51 @@ blockquote { } } - // Note: Deprecated small and .small as of v3.1.0 - // Context: https://github.com/twbs/bootstrap/issues/11660 - footer, - small, - .small { + footer { display: block; font-size: 80%; // back to default font-size - line-height: $line-height-base; + line-height: $line-height; color: $blockquote-small-color; &:before { - content: '\2014 \00A0'; // em dash, nbsp + content: "\2014 \00A0"; // em dash, nbsp } } } // Opposite alignment of blockquote -// -// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0. -.blockquote-reverse, -blockquote.pull-right { - padding-right: 15px; +.blockquote-reverse { + padding-right: $spacer; padding-left: 0; - border-right: 5px solid $blockquote-border-color; - border-left: 0; text-align: right; + border-right: .25rem solid $blockquote-border-color; + border-left: 0; // Account for citation - footer, - small, - .small { - &:before { content: ''; } + footer { + &:before { content: ""; } &:after { - content: '\00A0 \2014'; // nbsp, em dash + content: "\00A0 \2014"; // nbsp, em dash } } } -// Addresses -address { - margin-bottom: $line-height-computed; - font-style: normal; - line-height: $line-height-base; +// +// 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); + } +} + +.figure-caption { + font-size: 90%; + color: $gray-light; } |