diff options
Diffstat (limited to '')
| -rw-r--r-- | assets/css/bootstrap-3.3.2/type.less (renamed from assets/css/lib/bootstrap/_type.scss) | 148 |
1 files changed, 73 insertions, 75 deletions
diff --git a/assets/css/lib/bootstrap/_type.scss b/assets/css/bootstrap-3.3.2/type.less index 3f21b21..3ec976e 100644 --- a/assets/css/lib/bootstrap/_type.scss +++ b/assets/css/bootstrap-3.3.2/type.less @@ -8,24 +8,24 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: $headings-font-family; - font-weight: $headings-font-weight; - line-height: $headings-line-height; - color: $headings-color; + font-family: @headings-font-family; + 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; + color: @headings-small-color; } } h1, .h1, h2, .h2, h3, .h3 { - margin-top: $line-height-computed; - margin-bottom: ($line-height-computed / 2); + margin-top: @line-height-computed; + margin-bottom: (@line-height-computed / 2); small, .small { @@ -35,8 +35,8 @@ h3, .h3 { h4, .h4, h5, .h5, h6, .h6 { - margin-top: ($line-height-computed / 2); - margin-bottom: ($line-height-computed / 2); + margin-top: (@line-height-computed / 2); + margin-bottom: (@line-height-computed / 2); small, .small { @@ -44,29 +44,29 @@ h6, .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; } +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; } // Body text // ------------------------- p { - margin: 0 0 ($line-height-computed / 2); + margin: 0 0 (@line-height-computed / 2); } .lead { - margin-bottom: $line-height-computed; - font-size: floor(($font-size-base * 1.15)); + 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); + @media (min-width: @screen-sm-min) { + font-size: (@font-size-base * 1.5); } } @@ -77,17 +77,12 @@ p { // Ex: (12px small font / 14px base font) * 100% = about 85% small, .small { - font-size: floor((100% * $font-size-small / $font-size-base)); -} - -// Undo browser default styling -cite { - font-style: normal; + font-size: floor((100% * @font-size-small / @font-size-base)); } mark, .mark { - background-color: $state-warning-bg; + background-color: @state-warning-bg; padding: .2em; } @@ -105,18 +100,23 @@ mark, // Contextual colors .text-muted { - color: $text-muted; + color: @text-muted; +} +.text-primary { + .text-emphasis-variant(@brand-primary); +} +.text-success { + .text-emphasis-variant(@state-success-text); +} +.text-info { + .text-emphasis-variant(@state-info-text); +} +.text-warning { + .text-emphasis-variant(@state-warning-text); +} +.text-danger { + .text-emphasis-variant(@state-danger-text); } - -@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 @@ -125,25 +125,29 @@ mark, // Given the contrast here, this is the only class to have its color inverted // automatically. color: #fff; + .bg-variant(@brand-primary); +} +.bg-success { + .bg-variant(@state-success-bg); +} +.bg-info { + .bg-variant(@state-info-bg); +} +.bg-warning { + .bg-variant(@state-warning-bg); +} +.bg-danger { + .bg-variant(@state-danger-bg); } -@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; + padding-bottom: ((@line-height-computed / 2) - 1); + margin: (@line-height-computed * 2) 0 @line-height-computed; + border-bottom: 1px solid @page-header-border-color; } @@ -154,7 +158,7 @@ mark, ul, ol { margin-top: 0; - margin-bottom: ($line-height-computed / 2); + margin-bottom: (@line-height-computed / 2); ul, ol { margin-bottom: 0; @@ -171,7 +175,7 @@ ol { // Inline turns list items into inline-block .list-inline { - @extend .list-unstyled; + .list-unstyled(); margin-left: -5px; > li { @@ -184,11 +188,11 @@ ol { // Description Lists dl { margin-top: 0; // Remove browser default - margin-bottom: $line-height-computed; + margin-bottom: @line-height-computed; } dt, dd { - line-height: $line-height-base; + line-height: @line-height-base; } dt { font-weight: bold; @@ -204,19 +208,19 @@ dd { .dl-horizontal { dd { - @include clearfix(); // Clear the floated `dt` if an empty `dd` is present + &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present } - @media (min-width: $grid-float-breakpoint) { + @media (min-width: @grid-float-breakpoint) { dt { float: left; - width: ($dl-horizontal-offset - 20); + width: (@dl-horizontal-offset - 20); clear: left; text-align: right; - @include text-overflow(); + .text-overflow(); } dd { - margin-left: $dl-horizontal-offset; + margin-left: @dl-horizontal-offset; } } } @@ -230,7 +234,7 @@ 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; + border-bottom: 1px dotted @abbr-border-color; } .initialism { font-size: 90%; @@ -239,10 +243,10 @@ abbr[data-original-title] { // Blockquotes blockquote { - padding: ($line-height-computed / 2) $line-height-computed; - margin: 0 0 $line-height-computed; - font-size: $blockquote-font-size; - border-left: 5px solid $blockquote-border-color; + padding: (@line-height-computed / 2) @line-height-computed; + margin: 0 0 @line-height-computed; + font-size: @blockquote-font-size; + border-left: 5px solid @blockquote-border-color; p, ul, @@ -259,8 +263,8 @@ blockquote { .small { display: block; font-size: 80%; // back to default font-size - line-height: $line-height-base; - color: $blockquote-small-color; + line-height: @line-height-base; + color: @blockquote-small-color; &:before { content: '\2014 \00A0'; // em dash, nbsp @@ -275,7 +279,7 @@ blockquote { blockquote.pull-right { padding-right: 15px; padding-left: 0; - border-right: 5px solid $blockquote-border-color; + border-right: 5px solid @blockquote-border-color; border-left: 0; text-align: right; @@ -290,15 +294,9 @@ blockquote.pull-right { } } -// Quotes -blockquote:before, -blockquote:after { - content: ""; -} - // Addresses address { - margin-bottom: $line-height-computed; + margin-bottom: @line-height-computed; font-style: normal; - line-height: $line-height-base; + line-height: @line-height-base; } |