fuse 0.1.4 → 0.1.5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/fuse.rb +1 -1
- data/lib/fuse/document.rb +2 -1
- data/lib/fuse/document/asset_types.rb +1 -0
- metadata +2 -2
data/lib/fuse.rb
CHANGED
data/lib/fuse/document.rb
CHANGED
@@ -69,7 +69,7 @@ class Fuse::Document
|
|
69
69
|
font_css << 'font-family: "%s";' % first.family
|
70
70
|
font_css << 'font-weight: %s;' % first.weight
|
71
71
|
font_css << 'font-style: %s;' % first.style
|
72
|
-
font_css << 'src: url("%s");' % formats[:eot].relative_path if formats[:eot]
|
72
|
+
font_css << 'src: url("%s");' % formats[:eot].relative_path if formats[:eot] && !@options[:embed_assets]
|
73
73
|
css_formats = []
|
74
74
|
Fuse::Document::Asset::Font::CSS_FORMATS.each do |css_format|
|
75
75
|
css_formats << 'url("%s") format("%s")' % [
|
@@ -78,6 +78,7 @@ class Fuse::Document
|
|
78
78
|
] if formats[css_format[:extension]]
|
79
79
|
end
|
80
80
|
font_css << 'src: %s;' % css_formats.join(', ') if css_formats.any?
|
81
|
+
font_css << '}'
|
81
82
|
end
|
82
83
|
end
|
83
84
|
unless font_css.empty?
|
@@ -112,6 +112,7 @@ class Fuse::Document::Asset
|
|
112
112
|
MIME_TYPES = {
|
113
113
|
otf: 'application/x-font-opentype',
|
114
114
|
ttf: 'application/x-font-truetype',
|
115
|
+
woff: 'application/x-font-woff'
|
115
116
|
}
|
116
117
|
VARIANT_PATTERN = %r`([^/]+?)(?:[-_ ](normal|bold|bolder|lighter|[1-9]00))?(?:[-_ ](normal|italic|oblique))?\.[a-z]+$`
|
117
118
|
def family; @family ||= variant[:family] end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fuse
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-03-
|
12
|
+
date: 2013-03-07 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: thin
|