compass 0.11.beta.1 → 0.11.beta.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +14 -4
- data/lib/compass/app_integration/rails/installer.rb +1 -1
- data/lib/compass/installers/manifest_installer.rb +1 -1
- data/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css +1 -7
- data/test/fixtures/stylesheets/compass/css/fonts.css +5 -0
- metadata +13 -8
data/VERSION.yml
CHANGED
@@ -7,16 +7,26 @@
|
|
7
7
|
// * $font-files is required using font-files('relative/location', 'format').
|
8
8
|
// for best results use this order: woff, opentype/truetype, svg
|
9
9
|
// * $eot is required by IE, and is a relative location of the eot file.
|
10
|
+
// * For android 2.2 Compatiblity, please ensure that your web page has
|
11
|
+
// a meta viewport tag.
|
12
|
+
// * To support iOS < 4.2, an SVG file must be provided
|
13
|
+
//
|
14
|
+
// If you need to generate other formats check out the Font Squirrel
|
15
|
+
// [font generator](http://www.fontsquirrel.com/fontface/generator)
|
10
16
|
|
11
|
-
@mixin font-face($name, $font-files, $eot: false
|
12
|
-
@if $postscript or $style {
|
13
|
-
@warn "The $postscript and $style variables have been deprecated in favor of the Paul Irish smiley bulletproof technique.";
|
14
|
-
}
|
17
|
+
@mixin font-face($name, $font-files, $eot: false) {
|
15
18
|
@font-face {
|
16
19
|
font-family: quote($name);
|
17
20
|
@if $eot { src: font-url($eot); }
|
18
21
|
src: local("☺"), $font-files;
|
19
22
|
}
|
23
|
+
@media screen and (max-device-width: 480px) {
|
24
|
+
@font-face {
|
25
|
+
font-family: quote($name);
|
26
|
+
src: $font-files;
|
27
|
+
}
|
28
|
+
}
|
29
|
+
|
20
30
|
}
|
21
31
|
|
22
32
|
// EXAMPLE
|
@@ -163,7 +163,7 @@ NEXTSTEPS
|
|
163
163
|
manifest.each_stylesheet do |stylesheet|
|
164
164
|
# Skip partials.
|
165
165
|
next if File.basename(stylesheet.from)[0..0] == "_"
|
166
|
-
ss_line = "<%= stylesheet_link_tag '#{stylesheet_prefix}#{stylesheet.to.sub(/\.
|
166
|
+
ss_line = "<%= stylesheet_link_tag '#{stylesheet_prefix}#{stylesheet.to.sub(/\.s[ac]ss$/,'.css')}'"
|
167
167
|
if stylesheet.options[:media]
|
168
168
|
ss_line += ", :media => '#{stylesheet.options[:media]}'"
|
169
169
|
end
|
@@ -48,7 +48,7 @@ module Compass
|
|
48
48
|
media = if stylesheet.options[:media]
|
49
49
|
%Q{ media="#{stylesheet.options[:media]}"}
|
50
50
|
end
|
51
|
-
ss_line = %Q{ <link href="#{http_stylesheets_path}/#{stylesheet.to.sub(/\.
|
51
|
+
ss_line = %Q{ <link href="#{http_stylesheets_path}/#{stylesheet.to.sub(/\.s[ac]ss$/,'.css')}"#{media} rel="stylesheet" type="text/css" />}
|
52
52
|
if stylesheet.options[:condition]
|
53
53
|
ss_line = " <!--[if #{stylesheet.options[:condition]}]>\n #{ss_line}\n <![endif]-->"
|
54
54
|
end
|
@@ -3,13 +3,7 @@ html {
|
|
3
3
|
padding: 0;
|
4
4
|
border: 0; }
|
5
5
|
|
6
|
-
.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, dialog, figure, footer, header, hgroup, nav, section, blockquote, q, th, td, caption, table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table,
|
7
|
-
div, span, object, iframe, p,
|
8
|
-
pre, a, abbr, acronym, address,
|
9
|
-
code, del, dfn, em, img,
|
10
|
-
dl, dt, dd, ol, ul, li, fieldset,
|
11
|
-
form, label, legend,
|
12
|
-
caption, tbody, tfoot, thead, tr {
|
6
|
+
.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, dialog, figure, footer, header, hgroup, nav, section, blockquote, q, th, td, caption, table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, div, span, object, iframe, p, pre, a, abbr, acronym, address, code, del, dfn, em, img, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr {
|
13
7
|
margin: 0;
|
14
8
|
padding: 0;
|
15
9
|
border: 0;
|
metadata
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: compass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
+
hash: 62196239
|
4
5
|
prerelease: true
|
5
6
|
segments:
|
6
7
|
- 0
|
7
8
|
- 11
|
8
9
|
- beta
|
9
|
-
-
|
10
|
-
version: 0.11.beta.
|
10
|
+
- 2
|
11
|
+
version: 0.11.beta.2
|
11
12
|
platform: ruby
|
12
13
|
authors:
|
13
14
|
- Chris Eppstein
|
@@ -18,7 +19,7 @@ autorequire:
|
|
18
19
|
bindir: bin
|
19
20
|
cert_chain: []
|
20
21
|
|
21
|
-
date: 2011-01
|
22
|
+
date: 2011-02-01 00:00:00 -08:00
|
22
23
|
default_executable: compass
|
23
24
|
dependencies:
|
24
25
|
- !ruby/object:Gem::Dependency
|
@@ -29,13 +30,14 @@ dependencies:
|
|
29
30
|
requirements:
|
30
31
|
- - ">="
|
31
32
|
- !ruby/object:Gem::Version
|
33
|
+
hash: -3702664552
|
32
34
|
segments:
|
33
35
|
- 3
|
34
36
|
- 1
|
35
37
|
- 0
|
36
38
|
- alpha
|
37
|
-
-
|
38
|
-
version: 3.1.0.alpha.
|
39
|
+
- 218
|
40
|
+
version: 3.1.0.alpha.218
|
39
41
|
type: :runtime
|
40
42
|
version_requirements: *id001
|
41
43
|
- !ruby/object:Gem::Dependency
|
@@ -46,11 +48,12 @@ dependencies:
|
|
46
48
|
requirements:
|
47
49
|
- - ~>
|
48
50
|
- !ruby/object:Gem::Version
|
51
|
+
hash: 47
|
49
52
|
segments:
|
50
53
|
- 0
|
51
|
-
-
|
52
|
-
-
|
53
|
-
version: 0.
|
54
|
+
- 12
|
55
|
+
- 0
|
56
|
+
version: 0.12.0
|
54
57
|
type: :runtime
|
55
58
|
version_requirements: *id002
|
56
59
|
description: Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.
|
@@ -828,6 +831,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
828
831
|
requirements:
|
829
832
|
- - ">="
|
830
833
|
- !ruby/object:Gem::Version
|
834
|
+
hash: 3
|
831
835
|
segments:
|
832
836
|
- 0
|
833
837
|
version: "0"
|
@@ -836,6 +840,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
836
840
|
requirements:
|
837
841
|
- - ">"
|
838
842
|
- !ruby/object:Gem::Version
|
843
|
+
hash: 25
|
839
844
|
segments:
|
840
845
|
- 1
|
841
846
|
- 3
|