middleman-sculptor 0.19 → 0.20

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: aa9a6e73f7ff4761c5a1dac786799c0d3d6b118d
4
- data.tar.gz: b44097a3eba2b1a5b03bac9c5ac5dd6195be0514
3
+ metadata.gz: 1b876cfa48ae2f4763cee66b0a01baf72e518acf
4
+ data.tar.gz: fd5b43a89df7dbff46347e526d54ae7b4dc2f27c
5
5
  SHA512:
6
- metadata.gz: 83a012ee624d8583086333d0fe51bcbd8f28c0e576856ee1fca4060ab9603a4e65c55fec920b5031a535632cf9c9adb2ad2c8ec448fc0337917270321443c909
7
- data.tar.gz: 9a54a6d89b9240ff87090401a62c643c727571529d3cab07c0c3f3456ed69f32f84cc9023593e986e3143e222b8784e816a999255b140ad43a4d3e886c9f5123
6
+ metadata.gz: 9ea0021328e5a2caabeb6185c6d891b69464431f5dc050a624a36cef98d23facf480e1b10fb4a1524a3f625d69285b529f444897e0da63745e9b2e26344e0ca8
7
+ data.tar.gz: 1b834eeccef97df3df26f843c3ad8f60682bea8eed412da580a1f5ee8101421911d1d58e29109c24b74622f62eb0654feb9371c5a4020fe0b0aef3f3129282ac
@@ -35,15 +35,15 @@ button {
35
35
  }
36
36
 
37
37
  .glypto-section {
38
- margin: 0 -10px 40px;
39
- padding: 0 10px 40px;
38
+ margin: 0 -10px 60px;
39
+ padding: 0 10px 60px;
40
40
 
41
41
  &:after {
42
42
  @include position(absolute, null 0 null 0);
43
43
  content: '';
44
44
  background: lighten($dark-grey, 55);
45
- height: 3px;
46
- margin-top: 39px;
45
+ height: 2px;
46
+ margin-top: 60px;
47
47
  }
48
48
 
49
49
  &:last-child {
@@ -24,8 +24,12 @@ article.glypto-model
24
24
  - current_js = include_javascripts(javascripts)
25
25
  - included_js = yield_content(:javascripts)
26
26
 
27
- - if include_stylesheets(stylesheets) != yield_content(:stylesheets)
28
- - content_for :stylesheets, include_stylesheets(stylesheets)
27
+ - current_css = include_stylesheets(stylesheets)
28
+ - included_css = yield_content(:stylesheets)
29
+
30
+ - if current_css
31
+ - unless (included_css && included_css.match(current_css))
32
+ - content_for :stylesheets, include_stylesheets(stylesheets)
29
33
 
30
34
  - if current_js
31
35
  - unless (included_js && included_js.match(current_js))
@@ -7,6 +7,8 @@ html
7
7
  = yield_content :stylesheets
8
8
  - if current_resource.metadata.options.iframe
9
9
  = include_stylesheets(current_page.data.stylesheets || current_page.data.stylesheet)
10
+ - if current_resource.data.isolation_styles
11
+ style = current_resource.data.isolation_styles
10
12
 
11
13
  body class="#{yield_content(:body_class)}"
12
14
  - id = current_resource.metadata.options.id
@@ -5,6 +5,7 @@ html ng-app=(yield_content(:ng_app))
5
5
  title = yield_content :page_title
6
6
  meta name='viewport' content='width=device-width'
7
7
  = stylesheet_link_tag '//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css'
8
+ - content_for :stylesheets, stylesheet_link_tag('app')
8
9
  = yield_content :stylesheets
9
10
  = javascript_include_tag 'head-js'
10
11
 
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Sculptor
3
- VERSION = "0.19"
3
+ VERSION = "0.20"
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.19'
4
+ version: '0.20'
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-06-03 00:00:00.000000000 Z
11
+ date: 2015-06-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: middleman-core