github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
Conflicts:
	doc-src/content/CHANGELOG.markdown
This commit is contained in:
Chris Eppstein 2012-01-28 16:30:03 -08:00
commit 36b0da8caf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc-src/content/CHANGELOG.markdown
View File

@ -69,6 +69,11 @@ The Documentation for the [latest preview release](http://beta.compass-style.org
`generated-image-url()` helper function. These should rarely be needed and `generated-image-url()` helper function. These should rarely be needed and
will default to your corresponding image directories and paths. will default to your corresponding image directories and paths.
0.11.7 (UNRELEASED)
-------------------
* Update to font-face mixin to make it work on IE8.
0.11.6 (12/23/2011) 0.11.6 (12/23/2011)
------------------- -------------------

2
frameworks/compass/stylesheets/compass/css3/_font-face.scss
View File

@ -30,7 +30,7 @@
$weight: false, $weight: false,
$style: false $style: false
) { ) {
$iefont: unquote("#{$eot}?iefix"); $iefont: unquote("#{$eot}?#iefix");
@font-face { @font-face {
font-family: quote($name); font-family: quote($name);
@if $eot { @if $eot {