Skip to content

Commit

Permalink
Merge pull request #147 from treppo/master
Browse files Browse the repository at this point in the history
Font-face inclusion order
  • Loading branch information
Phil LaPier committed Dec 10, 2012
2 parents b1482b7 + 047a887 commit 732dc15
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions app/assets/stylesheets/css3/_font-face.scss
@@ -1,3 +1,5 @@
// Order of the includes matters, and it is: normal, bold, italic, bold+italic.

@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
@font-face {
font-family: $font-family;
Expand Down

0 comments on commit 732dc15

Please sign in to comment.