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

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.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE.txt +1 -1
  3. data/VERSION +1 -1
  4. data/docs/changelog.rst +8 -1
  5. data/lib/susy.rb +4 -2
  6. data/sass/susy/output/support/_rem.scss +2 -2
  7. data/sass/susy/output/support/_support.scss +7 -5
  8. data/templates/project/{_base.scss → _grids.scss} +5 -0
  9. data/templates/project/manifest.rb +2 -3
  10. data/templates/project/{screen.scss → style.scss} +1 -1
  11. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b5655917505fce129931804fc695e1e51625e95b
4
- data.tar.gz: c81923912ee3fff6b24c1044bf6d60c8456abc48
3
+ metadata.gz: 1ed060468e0b379868334c18c2a2236abde25ff7
4
+ data.tar.gz: 18415b3d808a06eb987d135b1069299ff7c5d1a3
5
5
  SHA512:
6
- metadata.gz: f6d1cf8d97dd318a0dbc9cc802d71b59347a55b7985c43b5837cb0efa0ce2d3d66c3547a8c8d5deff75c7b2620e7cf2f09cf45ad006bceac2766871058eb5262
7
- data.tar.gz: aef002701b2ef4cc933923e1ca6ccad8b28abd96fa39950b88a8d0b2ecf132e15deb7e96e45448e6ae6d014d81715d6081e89c155ded4863d9187950f22f3c1b
6
+ metadata.gz: 895a28b380e53ce6e80b8c4ef4ff2bc8f0784b731160358f18ff711f7fda0780d9c60b1072d2aad62afb4671b0f907412af6138857c45c3ccba4d6c129b5e504
7
+ data.tar.gz: cf74fa461370a0aec329c4cd0e31ecec5a329f29d451fe29553a0da7dea6383b906d7014293dac922aa94f2175a6d5ea36352d580fdbbd379cc7a2056c002008
data/LICENSE.txt CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2013, Eric Meyer
1
+ Copyright (c) 2014, Eric M. Suzanne
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.0.0.rc.0
1
+ 2.0.0.rc.1
data/docs/changelog.rst CHANGED
@@ -1,6 +1,13 @@
1
1
  Changelog
2
2
  =========
3
3
 
4
+ 2.0.0.rc.2 — Mar 4 2014
5
+ -----------------------
6
+
7
+ - Fix `templates_path` and compass project templates
8
+ - Fix Compass "rem" integration to respect ``$rhythm-units`` setting.
9
+
10
+
4
11
  2.0.0.rc.1 — Feb 7 2014
5
12
  -----------------------
6
13
 
@@ -257,7 +264,7 @@ Backwards Incompatible:
257
264
  to ``$show-grids`` setting.
258
265
  ``show`` will show both columns/baseline, default is ``show-columns``.
259
266
 
260
- .. _True: http://eric.andmeyer.com/true/
267
+ .. _True: http://ericsuzanne.com/true/
261
268
 
262
269
 
263
270
  2.0.0.alpha.2 — May 7 2013
data/lib/susy.rb CHANGED
@@ -1,7 +1,9 @@
1
- susy_stylesheets_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'sass'))
1
+ base_directory = File.expand_path(File.join(File.dirname(__FILE__), '..'))
2
+ susy_stylesheets_path = File.join(base_directory, 'sass')
3
+ susy_templates_path = File.join(base_directory, 'templates')
2
4
  begin
3
5
  require 'compass'
4
- Compass::Frameworks.register('susy', :stylesheets_directory => susy_stylesheets_path)
6
+ Compass::Frameworks.register('susy', :stylesheets_directory => susy_stylesheets_path, :templates_directory => susy_templates_path)
5
7
  rescue LoadError
6
8
  # compass not found, register on the Sass path via the environment.
7
9
  if ENV.has_key?("SASS_PATH")
data/sass/susy/output/support/_rem.scss CHANGED
@@ -11,10 +11,10 @@
11
11
  $val
12
12
  ) {
13
13
  $_reqs: (
14
- variable: rem-with-px-fallback,
14
+ variable: rhythm-unit rem-with-px-fallback,
15
15
  mixin: rem,
16
16
  );
17
- @if susy-support(rem, $_reqs, $warn: false) {
17
+ @if susy-support(rem, $_reqs, $warn: false) and $rhythm-unit == rem {
18
18
  @include rem($prop, $val);
19
19
  } @else {
20
20
  #{$prop}: $val;
data/sass/susy/output/support/_support.scss CHANGED
@@ -65,12 +65,14 @@
65
65
  $_fail: false;
66
66
 
67
67
  @each $_type, $_req in $requirements {
68
- $_pass: call(#{$_type}-exists, $_req);
68
+ @each $_i in $_req {
69
+ $_pass: call(#{$_type}-exists, $_i);
69
70
 
70
- @if not $_pass {
71
- $_fail: true;
72
- @if $warn {
73
- @warn "You requested custom support of #{$feature}, but the #{$_req} #{$_type} is not available.";
71
+ @if not $_pass {
72
+ $_fail: true;
73
+ @if $warn {
74
+ @warn "You requested custom support of #{$feature}, but the #{$_i} #{$_type} is not available.";
75
+ }
74
76
  }
75
77
  }
76
78
  }
data/templates/project/{_base.scss → _grids.scss} RENAMED
@@ -2,3 +2,8 @@
2
2
  // ============
3
3
 
4
4
  @import "susy";
5
+
6
+ $susy: (
7
+ columns: 12,
8
+ gutters: 1/4,
9
+ );
data/templates/project/manifest.rb CHANGED
@@ -1,8 +1,7 @@
1
- stylesheet 'screen.scss', :media => "screen, projection"
2
- stylesheet '_base.scss'
3
-
4
1
  description "Susy: custom Sass layouts. Your markup, your design, our math."
5
2
 
3
+ discover :stylesheets
4
+
6
5
  help %Q{
7
6
  Full documentation and tutorials available online:
8
7
 
data/templates/project/{screen.scss → style.scss} RENAMED
@@ -1,4 +1,4 @@
1
1
  // Screen
2
2
  // ======
3
3
 
4
- @import "base";
4
+ @import "grids";
metadata CHANGED
@@ -1,10 +1,10 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: susy
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc.1
4
+ version: 2.0.0.rc.2
5
5
  platform: ruby
6
6
  authors:
7
- - Eric Meyer
7
+ - Eric Suzanne
8
8
  - Tsachi Shlidor
9
9
  - Aaron Gray
10
10
  - Rachel Nabors
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2013-09-04 00:00:00.000000000 Z
16
+ date: 2014-02-18 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: sass
@@ -99,9 +99,9 @@ files:
99
99
  - sass/susy/output/support/_prefix.scss
100
100
  - sass/susy/output/support/_rem.scss
101
101
  - sass/susy/output/support/_support.scss
102
- - templates/project/_base.scss
102
+ - templates/project/_grids.scss
103
103
  - templates/project/manifest.rb
104
- - templates/project/screen.scss
104
+ - templates/project/style.scss
105
105
  - docs/changelog.rst
106
106
  - LICENSE.txt
107
107
  - README.md