grid-coordinates 1.1.3 → 1.1.4

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 (5) hide show
  1. data/README.mdown +14 -10
  2. data/lib/grid-coordinates.rb +2 -1
  3. data/stylesheets/_grid-coordinates.sass +20 -20
  4. data/stylesheets/_grid-coordinates.scss +18 -18
  5. metadata +4 -4
data/README.mdown CHANGED
@@ -48,21 +48,25 @@ When you use the mixin `+grid-coordinates` you are able to leverage the classes
48
48
 
49
49
  For an example of this in use, take a peek at [grid-coordinates.com/.../demo.sass](https://github.com/adamstac/grid-coordinates.com/blob/master/themes/grid-coordinates/sass/demo.sass).
50
50
 
51
- `@extend grid-container`
51
+ `@extend .grid-container`
52
52
 
53
- `@extend nested-grid-container`
53
+ `@extend .nested-grid-container`
54
54
 
55
- `@extend grid([columns])`
55
+ `@extend .grid([columns])`
56
56
 
57
- `@extend grid-prefix([columns])`
57
+ `@extend .grid-prefix([columns])`
58
58
 
59
- `@extend grid-suffix([columns])`
59
+ `@extend .grid-prefix-margin-([columns])`
60
60
 
61
- `@extend grid-push([columns])`
61
+ `@extend .grid-suffix([columns])`
62
62
 
63
- `@extend grid-pull([columns])`
63
+ `@extend .grid-suffix-margin-([columns])`
64
64
 
65
- `@extend grid-full`
65
+ `@extend .grid-push([columns])`
66
+
67
+ `@extend .grid-pull([columns])`
68
+
69
+ `@extend .grid-full`
66
70
 
67
71
  ### Using the Mixins
68
72
 
@@ -74,9 +78,9 @@ Use these mixins in your Sass stylesheets. Keep in mind that when you go the rou
74
78
 
75
79
  `+grid([columns])`
76
80
 
77
- `+grid-prefix([columns])`
81
+ `+grid-prefix([columns], [type])`
78
82
 
79
- `+grid-suffix([columns])`
83
+ `+grid-suffix([columns], [type])`
80
84
 
81
85
  `+grid-push([columns])`
82
86
 
data/lib/grid-coordinates.rb CHANGED
@@ -5,6 +5,7 @@ Compass::Frameworks.register("grid-coordinates", :path => "#{File.dirname(__FILE
5
5
 
6
6
  module GridCoordinates
7
7
 
8
- VERSION = "1.1.3".freeze
8
+ VERSION = "1.1.4".freeze
9
+ DATE = "2011-03-13".freeze
9
10
 
10
11
  end
data/stylesheets/_grid-coordinates.sass CHANGED
@@ -43,9 +43,15 @@ $overflow: true !default
43
43
  @for $i from 1 through $grid-columns - 1
44
44
  .grid-prefix-#{$i}
45
45
  +grid-prefix($i)
46
+ @for $i from 1 through $grid-columns - 1
47
+ .grid-prefix-margin-#{$i}
48
+ +grid-prefix($i,margin)
46
49
  @for $i from 1 through $grid-columns - 1
47
50
  .grid-suffix-#{$i}
48
51
  +grid-suffix($i)
52
+ @for $i from 1 through $grid-columns - 1
53
+ .grid-suffix-margin-#{$i}
54
+ +grid-suffix($i,margin)
49
55
  @for $i from 1 through $grid-columns - 1
50
56
  .grid-push-#{$i}
51
57
  +grid-push($i)
@@ -62,7 +68,7 @@ $overflow: true !default
62
68
  // Grid Container
63
69
  =grid-container-base
64
70
  margin: 0 auto
65
- width: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width
71
+ width: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
66
72
 
67
73
  =grid-container
68
74
  +overflow
@@ -72,8 +78,8 @@ $overflow: true !default
72
78
  =nested-grid-container-base
73
79
  display: inline-block
74
80
  margin:
75
- left: -$grid-gutter-width / 2
76
- right: -$grid-gutter-width / 2
81
+ left: -($grid-gutter-width / 2)
82
+ right: -($grid-gutter-width / 2)
77
83
  width: auto
78
84
 
79
85
  =nested-grid-container
@@ -84,7 +90,7 @@ $overflow: true !default
84
90
  =grid-block-base
85
91
  +float-left
86
92
  position: relative
87
- margin: 0 $grid-gutter-width / 2
93
+ margin: 0 ($grid-gutter-width / 2)
88
94
 
89
95
  =grid-block
90
96
  +grid-block-base
@@ -108,26 +114,20 @@ $overflow: true !default
108
114
  @else
109
115
  width: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) - $grid-gutter-width
110
116
 
111
- =grid-prefix($grid-columns)
112
- @if $grid-columns == 1
113
- padding-left: $grid-width + $grid-gutter-width
114
- @else
117
+ =grid-prefix($grid-columns, $type: "padding")
118
+ @if $type == "padding"
115
119
  padding-left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
116
-
117
- =grid-suffix($grid-columns)
118
- @if $grid-columns == 1
119
- padding-right: $grid-width + $grid-gutter-width
120
120
  @else
121
+ margin-left: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) + ($grid-gutter-width / 2)
122
+
123
+ =grid-suffix($grid-columns, $type: "padding")
124
+ @if $type == "padding"
121
125
  padding-right: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
126
+ @else
127
+ margin-right: (($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)) + ($grid-gutter-width / 2)
122
128
 
123
129
  =grid-push($grid-columns)
124
- @if $grid-columns == 1
125
- left: $grid-width + $grid-gutter-width
126
- @else
127
- left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
130
+ left: ($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
128
131
 
129
132
  =grid-pull($grid-columns)
130
- @if $grid-columns == 1
131
- left: -(($grid-width + $grid-gutter-width))
132
- @else
133
- left: -(($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width))
133
+ left: -($grid-columns * $grid-width) + ($grid-columns * $grid-gutter-width)
data/stylesheets/_grid-coordinates.scss CHANGED
@@ -42,9 +42,15 @@ $overflow: true !default;
42
42
  @for $i from 1 through $grid-columns - 1 {
43
43
  .grid-prefix-#{$i} {
44
44
  @include grid-prefix($i); } }
45
+ @for $i from 1 through $grid-columns - 1 {
46
+ .grid-prefix-margin-#{$i} {
47
+ @include grid-prefix($i, margin); } }
45
48
  @for $i from 1 through $grid-columns - 1 {
46
49
  .grid-suffix-#{$i} {
47
50
  @include grid-suffix($i); } }
51
+ @for $i from 1 through $grid-columns - 1 {
52
+ .grid-suffix-margin-#{$i} {
53
+ @include grid-suffix($i, margin); } }
48
54
  @for $i from 1 through $grid-columns - 1 {
49
55
  .grid-push-#{$i} {
50
56
  @include grid-push($i); } }
@@ -71,8 +77,8 @@ $overflow: true !default;
71
77
  @mixin nested-grid-container-base {
72
78
  display: inline-block;
73
79
  margin: {
74
- left: -$grid-gutter-width / 2;
75
- right: -$grid-gutter-width / 2; };
80
+ left: -($grid-gutter-width / 2);
81
+ right: -($grid-gutter-width / 2); };
76
82
  width: auto; }
77
83
 
78
84
  @mixin nested-grid-container {
@@ -107,26 +113,20 @@ $overflow: true !default;
107
113
  @else {
108
114
  width: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width - $grid-gutter-width; } }
109
115
 
110
- @mixin grid-prefix($grid-columns) {
111
- @if $grid-columns == 1 {
112
- padding-left: $grid-width + $grid-gutter-width; }
116
+ @mixin grid-prefix($grid-columns, $type: "padding") {
117
+ @if $type == "padding" {
118
+ padding-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
113
119
  @else {
114
- padding-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
120
+ margin-left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width + $grid-gutter-width / 2; } }
115
121
 
116
- @mixin grid-suffix($grid-columns) {
117
- @if $grid-columns == 1 {
118
- padding-right: $grid-width + $grid-gutter-width; }
122
+ @mixin grid-suffix($grid-columns, $type: "padding") {
123
+ @if $type == "padding" {
124
+ padding-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
119
125
  @else {
120
- padding-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
126
+ margin-right: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width + $grid-gutter-width / 2; } }
121
127
 
122
128
  @mixin grid-push($grid-columns) {
123
- @if $grid-columns == 1 {
124
- left: $grid-width + $grid-gutter-width; }
125
- @else {
126
- left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; } }
129
+ left: $grid-columns * $grid-width + $grid-columns * $grid-gutter-width; }
127
130
 
128
131
  @mixin grid-pull($grid-columns) {
129
- @if $grid-columns == 1 {
130
- left: -($grid-width + $grid-gutter-width); }
131
- @else {
132
- left: -($grid-columns * $grid-width + $grid-columns * $grid-gutter-width); } }
132
+ left: -($grid-columns * $grid-width) + $grid-columns * $grid-gutter-width; }
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grid-coordinates
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 27
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 3
10
- version: 1.1.3
9
+ - 4
10
+ version: 1.1.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Adam Stacoviak
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-09-20 00:00:00 -05:00
18
+ date: 2011-03-13 00:00:00 -06:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency