tartan-grid 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 433720a880e297b6b42d0a02758ba39c07b05c61
4
- data.tar.gz: 5008c6622233b75a31a455144c0b1f1e032878fd
5
- SHA512:
6
- metadata.gz: 18dd2c7f1e00cd8a3239f4b90a1b778b445b7d3f11b455e8242f279081307b6e3b305fcfc71083e81d62f9ef901edc169b4c23df464d2c88a272388c64cdc1af
7
- data.tar.gz: 0c87176de3d960ed748e96497439e9231a56e78c529bc6e8ca3bbf80d1d7e637bd3102fcffbbb66c40856633331170f7ab0e835b4c3dac04c81de7a62d0cab2c
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: 93846b50d9f7c2e79bd6d2f16f808c4805360b6f
4
+ data.tar.gz: 5877c7703f9d5909a47562eb2d11a7cb0f66bf3b
5
+ !binary "U0hBNTEy":
6
+ metadata.gz: b032f720b917ec5ac10f2cdc651ad27ed88c477023d06c61f2d51b2d75f04d20cca8a8d8eaeb88e358fd7141dc8fcad6c37c4a716f73fe274788148df140be17
7
+ data.tar.gz: cb1d9a7764ba3b7adad3203afd734985907f1f80662d117ef2b032fe42ec7685e77c269803dedf3724dd4b8bed7b1673e1322f799376dd3b5db6caebbc0fecd4
@@ -18,10 +18,24 @@
18
18
  }
19
19
  }
20
20
 
21
- @mixin tartan-sub-container {
21
+ @mixin tartan-sub-container($columns: $tartan-column-count, $context: $tartan-column-count) {
22
22
  @include tartan-container;
23
- max-width: 100%;
24
- padding: 0;
23
+
24
+ @if $tartan-render-mode == inline-block {
25
+ display: inline-block;
26
+ } @else {
27
+ display: block;
28
+ float: left;
29
+ }
30
+
31
+ margin-right: tartan-gutter($context);
32
+ margin-bottom: tartan-gutter($context);
33
+ width: tartan-columns($columns, $context);
34
+ vertical-align: top;
35
+
36
+ @if $columns == $context {
37
+ @include tartan-omega;
38
+ }
25
39
  }
26
40
 
27
41
  @mixin tartan-row {
@@ -50,10 +64,6 @@
50
64
  @if $tartan-render-mode == inline-block {
51
65
  letter-spacing: normal;
52
66
  }
53
-
54
- &:last-child {
55
- margin-bottom: 0;
56
- }
57
67
  }
58
68
 
59
69
  @mixin tartan-push-columns($columns: 1, $context: $tartan-column-count, $type: margin) {
@@ -1,3 +1,3 @@
1
1
  module Tartan
2
- VERSION = "1.0.0"
2
+ VERSION = "1.1.0"
3
3
  end
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tartan-grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Clem
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-31 00:00:00.000000000 Z
11
+ date: 2013-10-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ! '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: 3.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ! '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: 3.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ! '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ! '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
@@ -56,18 +56,19 @@ dependencies:
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
- description: |
70
- A simple grid for Heroku, with a Rails engine.
69
+ description: ! 'A simple grid for Heroku, with a Rails engine.
70
+
71
+ '
71
72
  email:
72
73
  - jonathan@jclem.net
73
74
  executables:
@@ -102,12 +103,12 @@ require_paths:
102
103
  - lib
103
104
  required_ruby_version: !ruby/object:Gem::Requirement
104
105
  requirements:
105
- - - '>='
106
+ - - ! '>='
106
107
  - !ruby/object:Gem::Version
107
108
  version: '0'
108
109
  required_rubygems_version: !ruby/object:Gem::Requirement
109
110
  requirements:
110
- - - '>='
111
+ - - ! '>='
111
112
  - !ruby/object:Gem::Version
112
113
  version: '0'
113
114
  requirements: []