Merge branch 'stable'
This commit is contained in:
commit
64d0787ce2
@ -6,6 +6,8 @@
|
|||||||
// * $font-files is required using font-files('relative/location', 'format').
|
// * $font-files is required using font-files('relative/location', 'format').
|
||||||
// for best results use this order: woff, opentype/truetype, svg
|
// for best results use this order: woff, opentype/truetype, svg
|
||||||
// * $eot is required by IE, and is a relative location of the eot file.
|
// * $eot is required by IE, and is a relative location of the eot file.
|
||||||
|
// * $weight shows if the font is bold, defaults to normal
|
||||||
|
// * $style defaults to normal, might be also italic
|
||||||
// * For android 2.2 Compatiblity, please ensure that your web page has
|
// * For android 2.2 Compatiblity, please ensure that your web page has
|
||||||
// a meta viewport tag.
|
// a meta viewport tag.
|
||||||
// * To support iOS < 4.2, an SVG file must be provided
|
// * To support iOS < 4.2, an SVG file must be provided
|
||||||
@ -13,13 +15,20 @@
|
|||||||
// If you need to generate other formats check out the Font Squirrel
|
// If you need to generate other formats check out the Font Squirrel
|
||||||
// [font generator](http://www.fontsquirrel.com/fontface/generator)
|
// [font generator](http://www.fontsquirrel.com/fontface/generator)
|
||||||
//
|
//
|
||||||
// Example:
|
|
||||||
//
|
// In order to refer to a specific style of the font in your stylesheets as
|
||||||
// @include font-face("this name", font-files("this.woff", woff, "this.otf", opentype), "this.eot")
|
// e.g. "font-style: italic;", you may add a couple of @font-face includes
|
||||||
|
// containing the respective font files for each style and specying
|
||||||
|
// respective the $style parameter.
|
||||||
|
|
||||||
|
// Order of the includes matters, and it is: normal, bold, italic, bold+italic.
|
||||||
|
|
||||||
@mixin font-face(
|
@mixin font-face(
|
||||||
$name,
|
$name,
|
||||||
$font-files,
|
$font-files,
|
||||||
$eot: false
|
$eot: false,
|
||||||
|
$weight: false,
|
||||||
|
$style: false
|
||||||
) {
|
) {
|
||||||
$iefont: unquote("#{$eot}?iefix");
|
$iefont: unquote("#{$eot}?iefix");
|
||||||
@font-face {
|
@font-face {
|
||||||
@ -29,5 +38,26 @@
|
|||||||
$font-files: font-url($iefont) unquote("format('eot')"), $font-files;
|
$font-files: font-url($iefont) unquote("format('eot')"), $font-files;
|
||||||
}
|
}
|
||||||
src: $font-files;
|
src: $font-files;
|
||||||
|
@if $weight {
|
||||||
|
font-weight: $weight;
|
||||||
|
}
|
||||||
|
@if $style {
|
||||||
|
font-style: $style;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EXAMPLE
|
||||||
|
// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot", bold, italic)
|
||||||
|
//
|
||||||
|
// will generate:
|
||||||
|
//
|
||||||
|
// @font-face {
|
||||||
|
// font-family: 'this name';
|
||||||
|
// src: url('fonts/this.eot');
|
||||||
|
// src: local("☺"),
|
||||||
|
// url('fonts/this.otf') format('woff'),
|
||||||
|
// url('fonts/this.woff') format('opentype');
|
||||||
|
// font-weight: bold;
|
||||||
|
// font-style: italic;
|
||||||
|
// }
|
||||||
|
Loading…
Reference in New Issue
Block a user