compass 1.1.0.alpha.1 → 1.1.0.alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/compass.rb +1 -0
- data/lib/compass/configuration/helpers.rb +4 -4
- data/lib/compass/generated_version.rb +1 -1
- data/lib/compass/sprite_importer.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c34f4a9522411d067ced24bf4e65aacd01b161b0
|
|
4
|
+
data.tar.gz: 9062ad628caa3eca0c7625a4c024a567cb65ca9a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2aae0a4826987f8add3ba159a8d7d4f7243e180904c1e848f75b34d0b8f22481d61186c29bb23529b05568ce4f88de9173162925cfa995af75b0b851bb1f6534
|
|
7
|
+
data.tar.gz: b6eb04af255592ee36ead5c97df32a142ee03908985c088caceb6bb4fe83c85554d8d950c82c017b465fd6fa33cc217293e2154def054df42d106a19cefdc71e
|
data/lib/compass.rb
CHANGED
|
@@ -47,11 +47,11 @@ module Compass
|
|
|
47
47
|
else
|
|
48
48
|
Sass::Plugin.on_updating_stylesheet(&on_saved)
|
|
49
49
|
end
|
|
50
|
-
|
|
50
|
+
|
|
51
51
|
Sass::Plugin.on_compilation_error do |e, filename, css|
|
|
52
52
|
Compass.configuration.run_stylesheet_error(filename, e.message)
|
|
53
53
|
end
|
|
54
|
-
|
|
54
|
+
|
|
55
55
|
@callbacks_loaded = true
|
|
56
56
|
end
|
|
57
57
|
end
|
|
@@ -66,7 +66,7 @@ module Compass
|
|
|
66
66
|
configuration_file_path = args.shift || detect_configuration_file
|
|
67
67
|
|
|
68
68
|
raise ArgumentError, "Too many arguments" if args.any?
|
|
69
|
-
if
|
|
69
|
+
if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
|
|
70
70
|
if data.raw_project_type
|
|
71
71
|
add_configuration(data.raw_project_type.to_sym)
|
|
72
72
|
elsif options[:project_type]
|
|
@@ -75,7 +75,7 @@ module Compass
|
|
|
75
75
|
add_configuration(:stand_alone)
|
|
76
76
|
end
|
|
77
77
|
add_configuration(data)
|
|
78
|
-
|
|
78
|
+
elsif !AppIntegration.default?
|
|
79
79
|
add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
|
|
80
80
|
end
|
|
81
81
|
end
|
|
@@ -86,7 +86,7 @@ module Compass
|
|
|
86
86
|
end
|
|
87
87
|
basenames
|
|
88
88
|
end[:files]
|
|
89
|
-
return resolved_files if resolved_files.any?
|
|
89
|
+
return resolved_files.sort if resolved_files.any?
|
|
90
90
|
path = Compass.configuration.sprite_resolver.asset_collections.map{|ac| ac.images_path }.join(", ")
|
|
91
91
|
raise Compass::SpriteException, %Q{No images were found in the sprite path matching "#{uri}". Your current load paths are: #{path}}
|
|
92
92
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: compass
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.0.alpha.
|
|
4
|
+
version: 1.1.0.alpha.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chris Eppstein
|
|
@@ -12,7 +12,7 @@ authors:
|
|
|
12
12
|
autorequire:
|
|
13
13
|
bindir: bin
|
|
14
14
|
cert_chain: []
|
|
15
|
-
date: 2014-09-
|
|
15
|
+
date: 2014-09-10 00:00:00.000000000 Z
|
|
16
16
|
dependencies:
|
|
17
17
|
- !ruby/object:Gem::Dependency
|
|
18
18
|
name: sass
|
|
@@ -40,14 +40,14 @@ dependencies:
|
|
|
40
40
|
requirements:
|
|
41
41
|
- - ~>
|
|
42
42
|
- !ruby/object:Gem::Version
|
|
43
|
-
version: 1.1.0.alpha.
|
|
43
|
+
version: 1.1.0.alpha.2
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
46
|
version_requirements: !ruby/object:Gem::Requirement
|
|
47
47
|
requirements:
|
|
48
48
|
- - ~>
|
|
49
49
|
- !ruby/object:Gem::Version
|
|
50
|
-
version: 1.1.0.alpha.
|
|
50
|
+
version: 1.1.0.alpha.2
|
|
51
51
|
- !ruby/object:Gem::Dependency
|
|
52
52
|
name: compass-import-once
|
|
53
53
|
requirement: !ruby/object:Gem::Requirement
|