middleman-sculptor 0.20 → 0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b876cfa48ae2f4763cee66b0a01baf72e518acf
-  data.tar.gz: fd5b43a89df7dbff46347e526d54ae7b4dc2f27c
+  metadata.gz: bed7b438a4d425ae82491c30da1ce5755ad98ac4
+  data.tar.gz: c94d0163330444d4ff74bdc88cb3f9123d7f5147
 SHA512:
-  metadata.gz: 9ea0021328e5a2caabeb6185c6d891b69464431f5dc050a624a36cef98d23facf480e1b10fb4a1524a3f625d69285b529f444897e0da63745e9b2e26344e0ca8
-  data.tar.gz: 1b834eeccef97df3df26f843c3ad8f60682bea8eed412da580a1f5ee8101421911d1d58e29109c24b74622f62eb0654feb9371c5a4020fe0b0aef3f3129282ac
+  metadata.gz: d9102a073ddcb5cfa9d58d0139d38d1b45d94d22501cad43c3d3b2ca44a47a4a2a1ce3927d94fb91d6af7fff73af6a253c24ec729db5f457adfdc7767daa6f6a
+  data.tar.gz: 76d54bd23ef65eaea10709e70edf534533c43f8a90ff26832c6847da35752addc593a8e392a140644a56eff443259926023fefa6b1f7e901bbb18d370da3ed07

data/lib/middleman-sculptor/helpers/model.rb

@@ -34,6 +34,7 @@ module Middleman::Sculptor
         models = {}
         models[id] = {
           iframe: options[:iframe] || false,
+          stylesheet: options[:stylesheet] || nil,
           html: html
         }
 

data/lib/middleman-sculptor/helpers/resources.rb

@@ -44,9 +44,9 @@ module Middleman::Sculptor
       end
 
       def main_sections
-        resources_for('/').select do |r|
-          r if r.parent.url == '/'
-        end
+        resources_for('/')
+          .select {|r| r.parent.url == '/' }
+          .reject {|r| r.url == '/./'}
       end
 
       def local_data(path)

data/lib/middleman-sculptor/template/source/assets/styles/glyptotheque/_base.scss

@@ -34,6 +34,12 @@ button {
   box-shadow: 0 0 20px black;
 }
 
+.glypto-container {
+  max-width: 960px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .glypto-section {
   margin: 0 -10px 60px;
   padding: 0 10px 60px;
@@ -165,6 +171,11 @@ button {
     }
   }
 
+  &.m-folder a {
+    border-color: rgba(black, .2);
+    box-shadow: 1px 1px 2px rgba(black, .1);
+  }
+
   .glypto-section-name {
     font-size: em(30);
     margin: 0;

data/lib/middleman-sculptor/template/source/glyptotheque/site-index.html.slim

@@ -4,7 +4,9 @@
   - if main_sections.any?
     ul.glypto-section-list
       - main_sections.each do |r|
-        li.glypto-section-list-item
+        li.glypto-section-list-item class="#{r.children.any? ? 'm-folder' : nil}"
           = link_to r.path
-            h2.glypto-section-name = get_section_of_resource(r).title
-            .glypto-section-meta = pluralize(resources_for(r.url).count, 'item')
+            h2.glypto-section-name
+              = get_section_of_resource(r).title
+            - if r.children.any?
+              .glypto-section-meta = pluralize(resources_for(r.url).count, 'item')

data/lib/middleman-sculptor/template/source/layouts/isolated.slim

@@ -1,23 +1,26 @@
+- id = current_resource.metadata.options.id
+- current_model = current_resource.metadata.models[id]
+
 doctype html
 html
   head
     meta charset='utf-8'
     title = page_title
     meta name='viewport' content='width=device-width'
-    = yield_content :stylesheets
-    - if current_resource.metadata.options.iframe
-      = include_stylesheets(current_page.data.stylesheets || current_page.data.stylesheet)
+    - if current_model[:stylesheet]
+      = include_stylesheets(current_model[:stylesheet])
+    - else
+      = yield_content :stylesheets
+      - if current_resource.metadata.options.iframe
+        = include_stylesheets(current_page.data.stylesheets || current_page.data.stylesheet)
     - if current_resource.data.isolation_styles
       style = current_resource.data.isolation_styles
 
   body class="#{yield_content(:body_class)}"
-    - id = current_resource.metadata.options.id
-    - current_model = current_resource.metadata.models[id]
-
     = current_model.html
 
     = javascript_include_tag  'iframe-js'
     = yield_content :javascripts
     - if current_resource.metadata.options.iframe
-      = include_javascripts(current_page.data.javascripts || current_page.data.javascript)
+      = include_javascripts(current_model[:javascript] || current_page.data.javascripts || current_page.data.javascript)
     = yield_content :post_body

data/lib/middleman-sculptor/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sculptor
-    VERSION = "0.20"
+    VERSION = "0.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sculptor
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: '0.21'
 platform: ruby
 authors:
 - Tyom Semonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core