Skip to content

Commit

Permalink
Merge pull request #110 from npm/medium-emphasis
Browse files Browse the repository at this point in the history
feat(typography): adds a `.em-medium` class
  • Loading branch information
rockbot committed Apr 7, 2016
2 parents 4b3e910 + 0892f0c commit 0c9f7fe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/pivotal-ui/components/pui-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ $font-size-extra-small: 12px;

$font-weight-em-low: 300;
$font-weight-em-default: 400;
$font-weight-em-medium: 600;
$font-weight-em-high: 700;
$font-weight-em-max: 800;

Expand Down
2 changes: 1 addition & 1 deletion src/pivotal-ui/components/typography/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"@npmcorp/pui-css-bootstrap": "^2.0.0",
"font-awesome": "^4.4.0"
},
"version": "4.0.0"
"version": "4.1.0"
}
3 changes: 3 additions & 0 deletions src/pivotal-ui/components/typography/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ Here's a table of all the emphasis modifier classes.
<h1 class="em-default">Default emphasis</h1>
<h1 class="em-medium">Medium emphasis</h1>
<h1 class="em-high">High emphasis</h1>
<h1 class="em-max">Maximum emphasis</h1>
Expand All @@ -223,6 +225,7 @@ Here's a table of all the emphasis modifier classes.

.em-low { font-weight: $font-weight-em-low !important; }
.em-default { font-weight: $font-weight-em-default !important; }
.em-medium { font-weight: $font-weight-em-medium !important; }
.em-high { font-weight: $font-weight-em-high !important; }
.em-max { font-weight: $font-weight-em-max !important; }
.em-alt { text-transform: uppercase !important; }
Expand Down

0 comments on commit 0c9f7fe

Please sign in to comment.