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

[Compass Core] +font-face mixin uses stylesheet_url to form urls relative to the css directory.

Browse Source
This commit is contained in:
Chris Eppstein 2009-11-25 22:55:42 -08:00
parent d6b170b851
commit 7da41d027a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass
View File

@ -11,14 +11,14 @@
@if !style @if !style
font-style= !style font-style= !style
@if !eot @if !eot
src: url('#{!eot}') src= stylesheet_url(!eot)
@if !postscript @if !postscript
src: local('#{!name}'), local('#{!postscript}'), #{!font_files} src: local('#{!name}'), local('#{!postscript}'), #{!font_files}
@else @else
src: local('#{!name}'), #{!font_files} src: local('#{!name}'), #{!font_files}
// EXAMPLE // EXAMPLE
+font-face("this name", font_files("this.woff", "woff", "this.otf", "opentype"), "fonts/this.eot", "thisname") +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "fonts/this.eot", "thisname")
will generate: will generate:

2
lib/compass/sass_extensions/functions/font_files.rb
View File

@ -3,7 +3,7 @@ module Compass::SassExtensions::Functions::FontFiles
raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0 raise Sass::SyntaxError, "An even number of arguments must be passed to font_files()" unless args.size % 2 == 0
files = [] files = []
while args.size > 0 while args.size > 0
files << "url('#{args.shift}') format('#{args.shift}')" files << "#{stylesheet_url(args.shift)} format('#{args.shift}')"
end end
Sass::Script::String.new(files.join(", ")) Sass::Script::String.new(files.join(", "))
end end