shelves 1.0.3 → 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
2
  SHA1:
3
- metadata.gz: 4aef35315e0dbdef6367165bc2348fe8d51163cc
4
- data.tar.gz: 80d9444edf77cd0d5025340c8c1ba3a84ff54461
3
+ metadata.gz: 8b4c89ec27b29664612cf6011ce03d2d311e5e45
4
+ data.tar.gz: 97515a7970d7d898c18dea3d63edbeddaa72ee1b
5
5
  SHA512:
6
- metadata.gz: b463b3392143b1953f4d83fc27e83f4c74efb7e90c95b2f79623fab9dabc8bf1f2fac783490fbcd70cc2cce3b1580a5f6c4292fb6ac88422696851fc90b04f15
7
- data.tar.gz: 71d1249c5a7200183f72e59de551207be36277cf10df92bc06c1f852a5db291ff6b19b8177eadb170bcd3ff60427a47f342699d96e7b29ca34c064dcf7ab6ca1
6
+ metadata.gz: e02b005eadb76ee8b6dd3fd05bb6acb9883debba3c7c57052f6a9cbd17de465fdfbcee505e9ed20bf65f7d543cc4263ebf40d8e2c5e78d7bcbdae0ee45c860de
7
+ data.tar.gz: 705aadefa454b8d804802e92f95494e215eb05d6a20261e958ef0124f56318c7b13b56a94077b9e8fb90437e8094d2d596c5ef7fab36cb62e8aa12b8c80392ac
@@ -1,3 +1,3 @@
1
1
  module Shelves
2
- VERSION = '1.0.3'
2
+ VERSION = '1.1.0'
3
3
  end
@@ -7,11 +7,11 @@
7
7
  @mixin with-grid($columns, $gutter: $shelves-gutter) {
8
8
  $original-shelves-columns: $shelves-columns;
9
9
  $original-shelves-gutter: $shelves-gutter;
10
- $shelves-columns: $columns;
11
- $shelves-gutter: $gutter;
10
+ $shelves-columns: $columns !global;
11
+ $shelves-gutter: $gutter !global;
12
12
  @content;
13
- $shelves-columns: $original-shelves-columns;
14
- $shelves-gutter: $original-shelves-gutter;
13
+ $shelves-columns: $original-shelves-columns !global;
14
+ $shelves-gutter: $original-shelves-gutter !global;
15
15
  }
16
16
 
17
17
  // Place the block of content with the given context (the current column size).
@@ -20,9 +20,9 @@
20
20
  //
21
21
  @mixin with-parent-column($context) {
22
22
  $original-shelves-contenxt: $shelves-context;
23
- $shelves-context: $context;
23
+ $shelves-context: $context !global;
24
24
  @content;
25
- $shelves-context: $original-shelves-contenxt;
25
+ $shelves-context: $original-shelves-contenxt !global;
26
26
  }
27
27
 
28
28
  // Place the block of content with the given desktop grid settings.
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
16
16
  gem.require_paths = ['lib']
17
17
  gem.version = Shelves::VERSION
18
18
 
19
- gem.add_runtime_dependency 'sass', '~> 3.2'
19
+ gem.add_runtime_dependency 'sass', '~> 3.3'
20
20
  gem.add_runtime_dependency 'choice', '~> 0.1'
21
21
  gem.add_development_dependency 'rake', '~> 10.0'
22
22
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shelves
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Browne
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-19 00:00:00.000000000 Z
11
+ date: 2014-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: '3.2'
19
+ version: '3.3'
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
- version: '3.2'
26
+ version: '3.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: choice
29
29
  requirement: !ruby/object:Gem::Requirement