susy 2.0.0.rc.1 → 2.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5655917505fce129931804fc695e1e51625e95b
-  data.tar.gz: c81923912ee3fff6b24c1044bf6d60c8456abc48
+  metadata.gz: 1ed060468e0b379868334c18c2a2236abde25ff7
+  data.tar.gz: 18415b3d808a06eb987d135b1069299ff7c5d1a3
 SHA512:
-  metadata.gz: f6d1cf8d97dd318a0dbc9cc802d71b59347a55b7985c43b5837cb0efa0ce2d3d66c3547a8c8d5deff75c7b2620e7cf2f09cf45ad006bceac2766871058eb5262
-  data.tar.gz: aef002701b2ef4cc933923e1ca6ccad8b28abd96fa39950b88a8d0b2ecf132e15deb7e96e45448e6ae6d014d81715d6081e89c155ded4863d9187950f22f3c1b
+  metadata.gz: 895a28b380e53ce6e80b8c4ef4ff2bc8f0784b731160358f18ff711f7fda0780d9c60b1072d2aad62afb4671b0f907412af6138857c45c3ccba4d6c129b5e504
+  data.tar.gz: cf74fa461370a0aec329c4cd0e31ecec5a329f29d451fe29553a0da7dea6383b906d7014293dac922aa94f2175a6d5ea36352d580fdbbd379cc7a2056c002008

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Eric Meyer
+Copyright (c) 2014, Eric M. Suzanne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/VERSION

@@ -1 +1 @@
-2.0.0.rc.0
+2.0.0.rc.1

data/docs/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.0.0.rc.2 — Mar 4 2014
+-----------------------
+
+- Fix `templates_path` and compass project templates
+- Fix Compass "rem" integration to respect ``$rhythm-units`` setting.
+
+
 2.0.0.rc.1 — Feb 7 2014
 -----------------------
 
@@ -257,7 +264,7 @@ Backwards Incompatible:
   to ``$show-grids`` setting.
   ``show`` will show both columns/baseline, default is ``show-columns``.
 
-.. _True: http://eric.andmeyer.com/true/
+.. _True: http://ericsuzanne.com/true/
 
 
 2.0.0.alpha.2 — May 7 2013

data/lib/susy.rb

@@ -1,7 +1,9 @@
-susy_stylesheets_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'sass'))
+base_directory  = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+susy_stylesheets_path = File.join(base_directory, 'sass')
+susy_templates_path = File.join(base_directory, 'templates')
 begin
   require 'compass'
-  Compass::Frameworks.register('susy', :stylesheets_directory => susy_stylesheets_path)
+  Compass::Frameworks.register('susy', :stylesheets_directory => susy_stylesheets_path, :templates_directory => susy_templates_path)
 rescue LoadError
   # compass not found, register on the Sass path via the environment.
   if ENV.has_key?("SASS_PATH")

data/sass/susy/output/support/_rem.scss

@@ -11,10 +11,10 @@
   $val
 ) {
   $_reqs: (
-    variable: rem-with-px-fallback,
+    variable: rhythm-unit rem-with-px-fallback,
     mixin: rem,
   );
-  @if susy-support(rem, $_reqs, $warn: false) {
+  @if susy-support(rem, $_reqs, $warn: false) and $rhythm-unit == rem {
     @include rem($prop, $val);
   } @else {
     #{$prop}: $val;

data/sass/susy/output/support/_support.scss

@@ -65,12 +65,14 @@
     $_fail: false;
 
     @each $_type, $_req in $requirements {
-      $_pass: call(#{$_type}-exists, $_req);
+      @each $_i in $_req {
+        $_pass: call(#{$_type}-exists, $_i);
 
-      @if not $_pass {
-        $_fail: true;
-        @if $warn {
-          @warn "You requested custom support of #{$feature}, but the #{$_req} #{$_type} is not available.";
+        @if not $_pass {
+          $_fail: true;
+          @if $warn {
+            @warn "You requested custom support of #{$feature}, but the #{$_i} #{$_type} is not available.";
+          }
         }
       }
     }

data/templates/project/{_base.scss → _grids.scss}

@@ -2,3 +2,8 @@
 // ============
 
 @import "susy";
+
+$susy: (
+  columns: 12,
+  gutters: 1/4,
+);

data/templates/project/manifest.rb

@@ -1,8 +1,7 @@
-stylesheet 'screen.scss', :media => "screen, projection"
-stylesheet '_base.scss'
-
 description "Susy: custom Sass layouts. Your markup, your design, our math."
 
+discover :stylesheets
+
 help %Q{
 Full documentation and tutorials available online:
 

data/templates/project/{screen.scss → style.scss}

@@ -1,4 +1,4 @@
 // Screen
 // ======
 
-@import "base";
+@import "grids";

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.0.0.rc.2
 platform: ruby
 authors:
-- Eric Meyer
+- Eric Suzanne
 - Tsachi Shlidor
 - Aaron Gray
 - Rachel Nabors
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -99,9 +99,9 @@ files:
 - sass/susy/output/support/_prefix.scss
 - sass/susy/output/support/_rem.scss
 - sass/susy/output/support/_support.scss
-- templates/project/_base.scss
+- templates/project/_grids.scss
 - templates/project/manifest.rb
-- templates/project/screen.scss
+- templates/project/style.scss
 - docs/changelog.rst
 - LICENSE.txt
 - README.md