zen-grids 2.0.0.alpha.1 → 2.0.0.alpha.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 (10) hide show
  1. data/README.txt +8 -6
  2. data/component.json +1 -1
  3. data/templates/unit-tests/manifest.rb +1 -2
  4. data/templates/unit-tests/sass/zen-grid-container.scss +10 -0
  5. data/templates/unit-tests/test-results/zen-grid-container.css +28 -0
  6. data/zen-grids.gemspec +3 -5
  7. data/zen-grids/_grids.scss +24 -12
  8. metadata +6 -8
  9. data/templates/unit-tests/sass/zen-nested-container.scss +0 -27
  10. data/templates/unit-tests/test-results/zen-nested-container.css +0 -21
data/README.txt CHANGED
@@ -22,7 +22,7 @@ to a 12 column grid.
22
22
  // each side of each column.
23
23
 
24
24
  .container {
25
- @include zen-grid-container; // Define the container for your grid items.
25
+ @include zen-grid-container(); // Define the container for your grid items.
26
26
  }
27
27
 
28
28
  $zen-column-count: 12; // Set the number of grid columns to use in this media
@@ -31,13 +31,13 @@ to a 12 column grid.
31
31
 
32
32
  @media all and (min-width: 50em) {
33
33
  .sidebar1 {
34
- @include zen-grid-item(3, 1); // Span 3 columns starting in 1st column
34
+ @include zen-grid-item(3, 1); // Span 3 columns starting in 1st column.
35
35
  }
36
36
  .content {
37
- @include zen-grid-item(6, 4); // Span 6 columns starting in 4th column
37
+ @include zen-grid-item(6, 4); // Span 6 columns starting in 4th column.
38
38
  }
39
39
  .sidebar2 {
40
- @include zen-grid-item(3, 10); // Span 3 columns starting in 10th column
40
+ @include zen-grid-item(3, 10); // Span 3 columns starting in 10th column.
41
41
  }
42
42
  }
43
43
 
@@ -76,8 +76,10 @@ of your .sass or .scss files and start creating!
76
76
  REQUIREMENTS
77
77
  ------------
78
78
 
79
- - Sass 3.1 or later
80
- - Compass 0.11 or later
79
+ - Sass 3.2 or later
80
+
81
+ For the zen-grids/background module only:
82
+ - Compass 0.12 or later
81
83
 
82
84
 
83
85
  LICENSE
data/component.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zen-grids",
3
- "version": "2.0.0-alpha.1",
3
+ "version": "2.0.0-alpha.2",
4
4
  "author": ["John Albin Wilkins"],
5
5
  "homepage": "http://zengrids.com/",
6
6
  "styles": [
data/templates/unit-tests/manifest.rb CHANGED
@@ -6,11 +6,11 @@ stylesheet 'sass/function-zen-half-gutter.scss', :media => 'all', :to => 'fu
6
6
  stylesheet 'sass/function-zen-unit-width.scss', :media => 'all', :to => 'function-zen-unit-width.scss'
7
7
  stylesheet 'sass/zen-clear.scss', :media => 'all', :to => 'zen-clear.scss'
8
8
  stylesheet 'sass/zen-float.scss', :media => 'all', :to => 'zen-float.scss'
9
+ stylesheet 'sass/zen-grid-background.scss', :media => 'all', :to => 'zen-grid-background.scss'
9
10
  stylesheet 'sass/zen-grid-container.scss', :media => 'all', :to => 'zen-grid-container.scss'
10
11
  stylesheet 'sass/zen-grid-flow-item.scss', :media => 'all', :to => 'zen-grid-flow-item.scss'
11
12
  stylesheet 'sass/zen-grid-item-base.scss', :media => 'all', :to => 'zen-grid-item-base.scss'
12
13
  stylesheet 'sass/zen-grid-item.scss', :media => 'all', :to => 'zen-grid-item.scss'
13
- stylesheet 'sass/zen-nested-container.scss', :media => 'all', :to => 'zen-nested-container.scss'
14
14
 
15
15
  file 'test-results/function-zen-direction-flip.css'
16
16
  file 'test-results/function-zen-grid-item-width.css'
@@ -22,7 +22,6 @@ file 'test-results/zen-grid-container.css'
22
22
  file 'test-results/zen-grid-flow-item.css'
23
23
  file 'test-results/zen-grid-item-base.css'
24
24
  file 'test-results/zen-grid-item.css'
25
- file 'test-results/zen-nested-container.css'
26
25
 
27
26
  file 'README.txt'
28
27
 
data/templates/unit-tests/sass/zen-grid-container.scss CHANGED
@@ -25,3 +25,13 @@
25
25
  $legacy-support-for-ie6: false;
26
26
  $legacy-support-for-ie7: false;
27
27
  }
28
+
29
+ #test-zen-grid-container-4 {
30
+ /* Test zen-grid-container() with $context = 'grid-item' */
31
+ @include zen-grid-container('grid-item');
32
+ }
33
+
34
+ #test-zen-grid-container-5 {
35
+ /* Test zen-grid-container() with $context = 'flow' */
36
+ @include zen-grid-container('flow');
37
+ }
data/templates/unit-tests/test-results/zen-grid-container.css CHANGED
@@ -38,3 +38,31 @@
38
38
  #test-zen-grid-container-3:after {
39
39
  clear: both;
40
40
  }
41
+
42
+ #test-zen-grid-container-4 {
43
+ /* Test zen-grid-container() with $context = 'grid-item' */
44
+ padding-left: 0;
45
+ padding-right: 0;
46
+ }
47
+ #test-zen-grid-container-4:before, #test-zen-grid-container-4:after {
48
+ content: "";
49
+ display: table;
50
+ }
51
+ #test-zen-grid-container-4:after {
52
+ clear: both;
53
+ }
54
+
55
+ #test-zen-grid-container-5 {
56
+ /* Test zen-grid-container() with $context = 'flow' */
57
+ margin-left: -10px;
58
+ margin-right: -10px;
59
+ padding-left: 0;
60
+ padding-right: 0;
61
+ }
62
+ #test-zen-grid-container-5:before, #test-zen-grid-container-5:after {
63
+ content: "";
64
+ display: table;
65
+ }
66
+ #test-zen-grid-container-5:after {
67
+ clear: both;
68
+ }
data/zen-grids.gemspec CHANGED
@@ -9,13 +9,13 @@ Gem::Specification.new do |s|
9
9
  s.homepage = 'http://zengrids.com'
10
10
  s.rubyforge_project =
11
11
 
12
- s.version = '2.0.0.alpha.1'
13
- s.date = '2013-02-19'
12
+ s.version = '2.0.0.alpha.2'
13
+ s.date = '2013-02-25'
14
14
 
15
15
  s.authors = ['John Albin Wilkins']
16
16
  s.email = 'virtually.johnalbin@gmail.com'
17
17
 
18
- s.add_runtime_dependency('sass', ">= 3.1")
18
+ s.add_runtime_dependency('sass', ">= 3.2")
19
19
 
20
20
  s.files = %w[
21
21
  component.json
@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
46
46
  templates/unit-tests/sass/zen-grid-flow-item.scss
47
47
  templates/unit-tests/sass/zen-grid-item-base.scss
48
48
  templates/unit-tests/sass/zen-grid-item.scss
49
- templates/unit-tests/sass/zen-nested-container.scss
50
49
  templates/unit-tests/test-results/function-zen-direction-flip.css
51
50
  templates/unit-tests/test-results/function-zen-grid-item-width.css
52
51
  templates/unit-tests/test-results/function-zen-half-gutter.css
@@ -58,7 +57,6 @@ Gem::Specification.new do |s|
58
57
  templates/unit-tests/test-results/zen-grid-flow-item.css
59
58
  templates/unit-tests/test-results/zen-grid-item-base.css
60
59
  templates/unit-tests/test-results/zen-grid-item.css
61
- templates/unit-tests/test-results/zen-nested-container.css
62
60
  zen-grids.gemspec
63
61
  ]
64
62
  end
data/zen-grids/_grids.scss CHANGED
@@ -33,13 +33,20 @@ $zen-reverse-all-floats : false !default;
33
33
 
34
34
 
35
35
  //
36
- // Apply this to the grid container element.
36
+ // Apply this to create a grid container element.
37
37
  // @see http://zengrids.com/help/#zen-grid-container
38
38
  //
39
- @mixin zen-grid-container {
39
+ @mixin zen-grid-container(
40
+ $context : 'none',
41
+ $gutter-width : $zen-gutter-width,
42
+ $float-direction : $zen-float-direction
43
+ ) {
44
+
45
+ // @TODO: This is a pre-IE8 line of code; don't remember why its needed.
40
46
  @if ($legacy-support-for-ie6 or $legacy-support-for-ie7) {
41
- *position: relative; // @TODO: This is a pre-IE8 line of code; don't remember why its needed.
47
+ *position: relative;
42
48
  }
49
+
43
50
  // We use the "micro clearfix", instead of Compass' clearfix or pie-clearfix.
44
51
  &:before,
45
52
  &:after {
@@ -52,16 +59,21 @@ $zen-reverse-all-floats : false !default;
52
59
  @if ($legacy-support-for-ie6 or $legacy-support-for-ie7) {
53
60
  *zoom: 1;
54
61
  }
55
- }
56
62
 
57
- //
58
- // Apply this to any grid item that is also a grid container element for a
59
- // nested grid. @see http://zengrids.com/help/#zen-nested-container
60
- //
61
- @mixin zen-nested-container {
62
- padding: {
63
- left: 0;
64
- right: 0;
63
+ // Un-do the gutter padding of the parent grid item.
64
+ @if $context == 'flow' {
65
+ margin: {
66
+ left: -(zen-half-gutter($gutter-width, left, $float-direction));
67
+ right: -(zen-half-gutter($gutter-width, right, $float-direction));
68
+ }
69
+ }
70
+
71
+ // Prevent any padding from messing up the alignment of the nested grid.
72
+ @if $context == 'grid-item' or $context == 'flow' {
73
+ padding: {
74
+ left: 0;
75
+ right: 0;
76
+ }
65
77
  }
66
78
  }
67
79
 
metadata CHANGED
@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
7
7
  - 0
8
8
  - 0
9
9
  - alpha
10
- - 1
11
- version: 2.0.0.alpha.1
10
+ - 2
11
+ version: 2.0.0.alpha.2
12
12
  platform: ruby
13
13
  authors:
14
14
  - John Albin Wilkins
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2013-02-19 00:00:00 +08:00
19
+ date: 2013-02-25 00:00:00 +08:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -28,8 +28,8 @@ dependencies:
28
28
  - !ruby/object:Gem::Version
29
29
  segments:
30
30
  - 3
31
- - 1
32
- version: "3.1"
31
+ - 2
32
+ version: "3.2"
33
33
  type: :runtime
34
34
  version_requirements: *id001
35
35
  description: Zen Grids is an intuitive, flexible grid system that leverages the natural source order of your content to make it easier to create fluid responsive designs. With an easy-to-use Sass mixin set, the Zen Grids system can be applied to an infinite number of layouts, including responsive, adaptive, fluid and fixed-width layouts.
@@ -69,7 +69,6 @@ files:
69
69
  - templates/unit-tests/sass/zen-grid-flow-item.scss
70
70
  - templates/unit-tests/sass/zen-grid-item-base.scss
71
71
  - templates/unit-tests/sass/zen-grid-item.scss
72
- - templates/unit-tests/sass/zen-nested-container.scss
73
72
  - templates/unit-tests/test-results/function-zen-direction-flip.css
74
73
  - templates/unit-tests/test-results/function-zen-grid-item-width.css
75
74
  - templates/unit-tests/test-results/function-zen-half-gutter.css
@@ -81,7 +80,6 @@ files:
81
80
  - templates/unit-tests/test-results/zen-grid-flow-item.css
82
81
  - templates/unit-tests/test-results/zen-grid-item-base.css
83
82
  - templates/unit-tests/test-results/zen-grid-item.css
84
- - templates/unit-tests/test-results/zen-nested-container.css
85
83
  - zen-grids.gemspec
86
84
  has_rdoc: true
87
85
  homepage: http://zengrids.com
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
110
108
  version: 1.3.1
111
109
  requirements: []
112
110
 
113
- rubyforge_project: 2.0.0.alpha.1
111
+ rubyforge_project: 2.0.0.alpha.2
114
112
  rubygems_version: 1.3.6
115
113
  signing_key:
116
114
  specification_version: 3
data/templates/unit-tests/sass/zen-nested-container.scss DELETED
@@ -1,27 +0,0 @@
1
- /**
2
- * @file
3
- * Test zen-nested-container()
4
- */
5
-
6
- @import "zen-grids";
7
-
8
- #test-zen-nested-container {
9
- /* Test zen-nested-container() */
10
- @include zen-nested-container();
11
- }
12
-
13
- #test-zen-nested-container-2 {
14
- /* Test zen-nested-container() with $legacy-support-for-ie7: true */
15
- $legacy-support-for-ie7: true;
16
- @include zen-nested-container();
17
- $legacy-support-for-ie7: false;
18
- }
19
-
20
- #test-zen-nested-container-3 {
21
- /* Test zen-nested-container() with $legacy-support-for-ie6: true */
22
- $legacy-support-for-ie6: true;
23
- $legacy-support-for-ie7: true;
24
- @include zen-nested-container();
25
- $legacy-support-for-ie6: false;
26
- $legacy-support-for-ie7: false;
27
- }
data/templates/unit-tests/test-results/zen-nested-container.css DELETED
@@ -1,21 +0,0 @@
1
- /**
2
- * @file
3
- * Test zen-nested-container()
4
- */
5
- #test-zen-nested-container {
6
- /* Test zen-nested-container() */
7
- padding-left: 0;
8
- padding-right: 0;
9
- }
10
-
11
- #test-zen-nested-container-2 {
12
- /* Test zen-nested-container() with $legacy-support-for-ie7: true */
13
- padding-left: 0;
14
- padding-right: 0;
15
- }
16
-
17
- #test-zen-nested-container-3 {
18
- /* Test zen-nested-container() with $legacy-support-for-ie6: true */
19
- padding-left: 0;
20
- padding-right: 0;
21
- }