Skip to content

Commit

Permalink
feat(typography): add h6
Browse files Browse the repository at this point in the history
[Finishes #82605848]

Signed-off-by: Nicole Sullivan <nsullivan@pivotal.io>
  • Loading branch information
bebepeng authored and stubbornella committed Nov 12, 2014
1 parent ce036ca commit def0393
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/pivotal-ui/components/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Set font sizes using headings and modifier classes.
<h5>h5 16px</h5>
<h6>h6 13px</h6>
<p>base font size 16px</p>
<p class="type-sm">small text 14px</p>
Expand Down Expand Up @@ -135,6 +137,10 @@ h5, .h5 {
font-weight: $font-weight-h5;
}

h6, .h6 {
font-weight: $font-weight-h6;
}

small,
.type-sm { font-size: $font-size-small; } // bootstrap override

Expand Down
3 changes: 2 additions & 1 deletion src/pivotal-ui/components/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ $font-weight-h4: 400;
$font-size-h5: 16px;
$font-weight-h5: 400;

$font-size-h6: null;
$font-size-h6: 13px;
$font-weight-h6: 400;

$line-height-base: 1.5; //1.428571429 !default; // 20/14
$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
Expand Down

0 comments on commit def0393

Please sign in to comment.