middleman-sculptor 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d71471a4587329d31fbd3dc7dd1497e7cad724f
-  data.tar.gz: 5f0362ea67ec541e9fd8a66f90c758bb598f4b8e
+  metadata.gz: f6ac77bee816f76f49961d955c50ced89c89910c
+  data.tar.gz: 3bddd6f9bc0cb7ed5161416146f1ffe2d7546344
 SHA512:
-  metadata.gz: 131d0a2a1f41fd964ef7d80d503a163abb72861fba02c96c2b4b1054debd08cb95bd41de9a82f74da10604ed6b0d245742abe604018e4770a54eb556eedc29ef
-  data.tar.gz: 38295171d2e2b9d9a850370572463c983064d6ed450e9bb11fad3c0113f03b8f0666e02c3e90e654813a71dda8e5703eeec7573056cb3a9ee980357197adce49
+  metadata.gz: 240425b86a9da0a6c50de62e6727839699a5789ad012bf5f89b31ce6af3234f2134d45c22ff02ce6c235c4b78893bf14f67a3d1ef7cfaf330054970a3b67d988
+  data.tar.gz: f0a0a804c409b9e6a056f5fbb36327de129bf53e853b9e443a911b61b02a094942499f45d8e7a2d2fd51981c6c334101ba6c6982294fd5ae6448e8873df03d5b

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

@@ -43,6 +43,12 @@ module Middleman::Sculptor
           .reject { |r| r[:parent] != '/' }  # Remove non-root directories from the root
       end
 
+      def main_sections
+        resources_for('/').select do |r|
+          r if r.metadata.locals[:name]
+        end
+      end
+
       def local_data(path)
         current_path =  current_resource.path
         if current_resource.metadata.page.has_key? :local_url

data/lib/middleman-sculptor/template/config.tt

@@ -10,11 +10,15 @@ page '*.css',   layout: false
 page '*.js',    layout: false
 page '*.json',  layout: false
 
-# Proxy default site index to Glyptotheque index template
-proxy 'index.html', 'glyptotheque/site-index.html'
-proxy 'sitemap.json', 'glyptotheque/sitemap.json'
+set :site_title, 'Glyptotheque'
 
 ready do
+  # Proxy default site index to Glyptotheque index template
+  unless sitemap.find_resource_by_path '/index.html'
+    proxy 'index.html', 'glyptotheque/site-index.html'
+  end
+  proxy 'sitemap.json', 'glyptotheque/sitemap.json'
+
   last_dir = nil
   # Prerender resources to populate models
   resources = resources_for('/', exclude_indexes: true, allow_hidden: true).each do |r|

data/lib/middleman-sculptor/template/source/assets/scripts/glyptotheque/directives.js

@@ -96,10 +96,13 @@ angular.module('directives', [])
 
         $element.on('focus', function() {
           activated = true;
+          this.originalPlaceholder = $element.attr('placeholder');
+          $element.attr('placeholder', 'Filter');
         });
 
         $element.on('blur', function() {
           activated = false;
+          $element.attr('placeholder', this.originalPlaceholder);
         });
       }
     };

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

@@ -36,7 +36,7 @@ button {
 .glypto-section {
   margin: 0 -30px 40px;
   padding: 0 30px 40px;
-  border-bottom: 2px solid lighten($dark-grey, 20);
+  border-bottom: 2px solid lighten($dark-grey, 50);
   box-shadow: 0 1px rgba(white, .4);
 
   &:last-child {
@@ -48,14 +48,25 @@ button {
 
 .glyptotheque,
 .glypto-section {
-  > h2 {
-    margin: 1.6em 0 .5em;
+  > h2,
+  > h3,
+  > h4 {
+    margin: 1.1em 0 .5em;
+    font-size: 36px;
+  }
+
+  h3 {
     font-size: 28px;
   }
+
+  h4 {
+    font-size: 24px;
+  }
 }
 
 .glypto-title {
   font-size: 48px;
+  font-family: 'Helvetica Neue';
   margin: 0 0 40px;
   letter-spacing: -.04em;
 
@@ -68,3 +79,10 @@ button {
     }
   }
 }
+
+h1.glypto-title {
+  margin: -40px -30px 40px;
+  padding: 40px 30px;
+  background: #ddd;
+  background: linear-gradient(58deg, #ddd, #f6f6f6);
+}

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

@@ -1,20 +1,34 @@
 @import 'pygments/github';
 
 .glypto-model {
-  margin: 40px 0 20px;
+  $_transition: 400ms ease-out;
+
+  transition: $_transition;
+  margin: 30px -10px 20px;
   border: 1px solid $light-grey;
   box-shadow: 0 0 0 3px #f6f6f6;
 
+  &:hover {
+    box-shadow: none;
+    border-color: transparent;
+
+    &:before {
+      opacity: 0;
+    }
+  }
+
   &:before {
+    transition: $_transition;
     content: 'EXAMPLE';
     position: absolute;
-    margin-top: -19px;
+    margin-top: -20px;
     margin-left: -4px;
-    font-size: 12px;
-    line-height: 12px;
+    font-size: 11px;
+    line-height: 1;
+    font-weight: 500;
     color: #aaa;
     background: #f6f6f6;
-    padding: 3px 10px;
+    padding: 4px 15px;
   }
 
   &:last-child {
@@ -25,6 +39,11 @@
     position: relative;
     padding: 1px;
 
+    &:hover + .glypto-model-utils {
+      transition: $_transition;
+      opacity: 0;
+    }
+
     &:before {
       @include position(absolute, 0 0 0 0);
       @include size(100px 12px);

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

@@ -15,7 +15,7 @@
     margin-left: -$glypto-nav-width;
 
     > .glypto-nav-toggle {
-      margin-right: -41px;
+      margin-right: -35px;
       opacity: .7;
       background: none;
 
@@ -32,9 +32,12 @@
   ._logo {
     font-weight: bold;
     padding: 0 10px;
-    line-height: 50px;
+    line-height: 45px;
     font-size: 16px;
     display: inline-block;
+    outline: none;
+    color: #aaa;
+    background: none;
 
     &:hover,
     &:focus {
@@ -76,12 +79,12 @@
 
   > .glypto-nav-toggle {
     @include size(25px);
-    transition: margin 360ms;
+    transition: margin 360ms ease-out;
     padding: 0;
     background: none;
     border: 0;
     float: right;
-    margin: 15px 10px 0 0;
+    margin: 10px 7px 0 0;
     position: relative;
     z-index: 1;
     cursor: pointer;
@@ -175,6 +178,11 @@
 
   li.s-selected > a {
     font-weight: 500;
-    background: black;
+    background: linear-gradient(58deg, rgba(black, .6), rgba(black, .1));
+
+    &:active,
+    &:focus {
+      background: black;
+    }
   }
 }

data/lib/middleman-sculptor/template/source/glyptotheque/_model-utils.slim

@@ -5,7 +5,7 @@
 
     - if id
       = link_to isolated_url, class: '_isolated', target: '_blank', title: 'Isolated version'
-        span> Isolated
+        span> Isolate
         i.fa.fa-external-link
 
   ._container

data/lib/middleman-sculptor/template/source/glyptotheque/_model.slim

@@ -10,7 +10,7 @@
 article.glypto-model
   .glypto-model-stage
     - if current_model.iframe
-      iframe id="iframe-#{id}" src="#{url_for(isolated_url)}" height="0" width="100%" frameborder="0" scrolling="no"
+      iframe id="iframe-#{id}" src="#{url_for(isolated_url)}" frameborder="0" scrolling="no"
     - else
       figure = current_model.html
 

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

@@ -1,3 +1,7 @@
+- unless current_page.data.title
+  - if current_page.metadata.locals[:name]
+    h1.glypto-title = current_page.metadata.locals.name
+
 - resources_for(current_page.url, exclude_indexes: true, sort_by: :nav_order).each do |r|
 
   - current_page.add_metadata({ page: { \

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

@@ -1,5 +1,6 @@
 - if resources_for('/').empty?
-  h1 Go ahead, create some models
-  p: code sculptor create hello
+  h1 Site is empty, create some pages
 - else
-  = partial 'glyptotheque/directory-index'
+  h1.glypto-title = site_title
+  - main_sections.each do |section|
+    h2 = link_to section.metadata.locals.name, section.path

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

@@ -1,4 +1,4 @@
-- content_for :page_title,  'Glyptotheque'
+- content_for :page_title,  site_title
 - content_for :ng_app,      'glyptotheque'
 - content_for :stylesheets,  stylesheet_link_tag('glyptotheque')
 

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

@@ -2,7 +2,13 @@ doctype html
 html
   head
     meta charset='utf-8'
-    title = current_page.data.title || yield_content(:page_title) || resource_file(current_page)
+    title
+      - if current_page.metadata.locals[:name]
+        => current_page.metadata.locals[:name]
+      - else
+        => current_page.data.title || yield_content(:page_title) || resource_file(current_page)
+      - if current_page.data.title || current_page.metadata.locals[:name]
+        | › #{site_title}
     meta name='viewport' content='width=device-width'
     = yield_content :stylesheets
     - if current_resource.metadata.options.iframe

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

@@ -2,7 +2,13 @@ doctype html
 html ng-app=(yield_content(:ng_app))
   head
     meta charset='utf-8'
-    title = current_page.data.title || yield_content(:page_title) || resource_file(current_page)
+    title
+      - if current_page.metadata.locals[:name]
+        => current_page.metadata.locals[:name]
+      - else
+        => current_page.data.title || yield_content(:page_title) || resource_file(current_page)
+      - if current_page.data.title || current_page.metadata.locals[:name]
+        | › #{site_title}
     meta name='viewport' content='width=device-width'
     = stylesheet_link_tag '//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css'
     = yield_content :stylesheets

data/lib/middleman-sculptor/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sculptor
-    VERSION = "0.8"
+    VERSION = "0.9"
   end
 end

metadata

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