middleman-sculptor 0.18 → 0.19

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: caf09f9383fa48238a2f29b1f7b67fe61952733e
4
- data.tar.gz: 8b3d7898f5d7c37b9cfc2b1132dcd6b4c9338ac6
3
+ metadata.gz: aa9a6e73f7ff4761c5a1dac786799c0d3d6b118d
4
+ data.tar.gz: b44097a3eba2b1a5b03bac9c5ac5dd6195be0514
5
5
  SHA512:
6
- metadata.gz: 721f9ed36324c92f88a9ece6b0f94bca2a60fc8c113b19f276e776d1f90bc99a6750e3ab11f1a19d4acd5d76b984ff701f3dfea32194951b8b25da9623dc2dbe
7
- data.tar.gz: ef9dd3683a766b86399418589e06d0610e0616d6aa91ece7c43266c0821efa319913c5c7549276fe2d39c7377d65de67d0adeb84fcbc27f1f3da30aadb578063
6
+ metadata.gz: 83a012ee624d8583086333d0fe51bcbd8f28c0e576856ee1fca4060ab9603a4e65c55fec920b5031a535632cf9c9adb2ad2c8ec448fc0337917270321443c909
7
+ data.tar.gz: 9a54a6d89b9240ff87090401a62c643c727571529d3cab07c0c3f3456ed69f32f84cc9023593e986e3143e222b8784e816a999255b140ad43a4d3e886c9f5123
@@ -31,18 +31,18 @@ module Middleman
31
31
  # Intercept requests to /javascripts and /stylesheets and pass to sprockets
32
32
  our_sprockets = self.environment
33
33
 
34
- [app.config[:js_dir], app.config[:css_dir], app.config[:images_dir], app.config[:fonts_dir]].each do |dir|
34
+ # # PATCH: Run Sprockets on any `scripts/styles` directory in `source`
35
+ paths = [app.config[:js_dir], app.config[:css_dir], app.config[:images_dir], app.config[:fonts_dir]]
36
+ extended_paths = Dir.glob("#{app.source}/**/*.{scss,js}")
37
+ .map { |p| Pathname.new(p).dirname.to_s }
38
+ .map { |p| p.sub("#{app.source}/", '') }
39
+ .select{|p| p.match /styles|scripts$/ }
40
+ .reject{|p| p.match /assets|glyptotheque/ }
41
+
42
+ (paths + extended_paths).uniq.each do |dir|
43
+ our_sprockets.append_path(dir)
35
44
  app.map("/#{dir}") { run our_sprockets }
36
45
  end
37
-
38
- # PATCH: Pass any `scripts` directory in `source` through Sprockets
39
- Dir.glob("#{app.root}/**/scripts").each do |dir|
40
- relative_dir = (dir.split('/') - (app.root.split('/') << app.source)).join('/')
41
- if app.config[:js_dir] != relative_dir
42
- our_sprockets.append_path(dir) # Append custom JS path into our sprockets path
43
- app.map("/#{relative_dir}") { run our_sprockets }
44
- end
45
- end
46
46
  end
47
47
  end
48
48
  end
@@ -37,7 +37,7 @@
37
37
 
38
38
  > .glypto-model-stage {
39
39
  position: relative;
40
- padding: 1px;
40
+ padding: 10px;
41
41
 
42
42
  & + .glypto-model-utils {
43
43
  transition: $_transition;
@@ -74,7 +74,6 @@
74
74
 
75
75
  > figure {
76
76
  @include clearfix;
77
- padding: 10px;
78
77
  }
79
78
 
80
79
  > iframe {
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Sculptor
3
- VERSION = "0.18"
3
+ VERSION = "0.19"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-sculptor
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.18'
4
+ version: '0.19'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tyom Semonov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-05 00:00:00.000000000 Z
11
+ date: 2015-06-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: middleman-core