neat 1.6.0.pre → 1.6.0.pre2

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: 69a0ec024eab967f90e54cab55d41cc0396cf1b1
4
- data.tar.gz: 6d4ab0534d288fc22b2d79931c07684095efc238
3
+ metadata.gz: d677e315545289ee861c6c418c6726366543beb1
4
+ data.tar.gz: 542c331b6147e9d80ee51e5ae1f8bb30c0cb9c7e
5
5
  SHA512:
6
- metadata.gz: 10ed8986ea12d1ef7d22824305e2712657de402755e72855b6f9d8d96d55627e0db552ac485cebf1f68f3715399e4ba58dd0de82ca61c0690e991505e3c05fd8
7
- data.tar.gz: 35ecd709322fd7d85304b7a57a67aeaab155dbeaa221d29cb206185e238401f338dc43a9c1290553f79130bbb0a8eb9a9d563bdbc0b5f250f23947b99305626b
6
+ metadata.gz: b9d357524340fe82ebf755860156376ef9e4514a07b7a40a6df6bb6b3b996784c5e6039cd8d6444be8852a0baf1a099ca4f2fed080532c09da71b04c0913c588
7
+ data.tar.gz: 6dd8b859fbd22f10e5f7e209f97c90d33e5a09cdee8b70a2f0a17c65a9eacb850ead35d4bf32d37e772f9ff08b100f23a003d7fcf3a528c1d843c2f6d64959b4
data/Rakefile CHANGED
@@ -11,7 +11,7 @@ task :test do
11
11
  puts "Creating a Bourbon directory..."
12
12
  `bourbon install --path test`
13
13
  puts "Generating CSS..."
14
- `sass --watch test:css/ --style expanded`
14
+ `sass -I . --watch test:css/ --style expanded`
15
15
  end
16
16
 
17
17
  task :clean do
@@ -9,7 +9,7 @@
9
9
  }
10
10
 
11
11
  @if not belongs-to($query, $visual-grid-breakpoints) {
12
- $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma);
12
+ $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global;
13
13
  }
14
14
 
15
15
  @return $query;
@@ -45,7 +45,7 @@
45
45
  }
46
46
 
47
47
  @function container-shift($shift: $shift) {
48
- $parent-columns: $grid-columns !default;
48
+ $parent-columns: $grid-columns !global !default;
49
49
 
50
50
  @if length($shift) == 3 {
51
51
  $container-columns: nth($shift, 3);
@@ -2,9 +2,9 @@
2
2
  @if length($query) == 1 {
3
3
  @media screen and ($default-feature: nth($query, 1)) {
4
4
  $default-grid-columns: $grid-columns;
5
- $grid-columns: $total-columns;
5
+ $grid-columns: $total-columns !global;
6
6
  @content;
7
- $grid-columns: $default-grid-columns;
7
+ $grid-columns: $default-grid-columns !global;
8
8
  }
9
9
  }
10
10
 
@@ -12,10 +12,10 @@
12
12
  $loopTo: length($query);
13
13
  $mediaQuery: 'screen and ';
14
14
  $default-grid-columns: $grid-columns;
15
- $grid-columns: $total-columns;
15
+ $grid-columns: $total-columns !global;
16
16
 
17
17
  @if length($query) % 2 != 0 {
18
- $grid-columns: nth($query, $loopTo);
18
+ $grid-columns: nth($query, $loopTo) !global;
19
19
  $loopTo: $loopTo - 1;
20
20
  }
21
21
 
@@ -32,7 +32,7 @@
32
32
 
33
33
  @media #{$mediaQuery} {
34
34
  @content;
35
- $grid-columns: $default-grid-columns;
35
+ $grid-columns: $default-grid-columns !global;
36
36
  }
37
37
  }
38
38
  }
@@ -22,9 +22,9 @@ $layout-direction: nil !default;
22
22
 
23
23
  @function get-parent-columns($columns) {
24
24
  @if $columns != $grid-columns {
25
- $parent-columns: $columns;
25
+ $parent-columns: $columns !global;
26
26
  } @else {
27
- $parent-columns: $grid-columns;
27
+ $parent-columns: $grid-columns !global;
28
28
  }
29
29
 
30
30
  @return $parent-columns;
@@ -1,9 +1,9 @@
1
1
  @mixin reset-display {
2
- $container-display-table: false;
2
+ $container-display-table: false !global;
3
3
  }
4
4
 
5
5
  @mixin reset-layout-direction {
6
- $layout-direction: $default-layout-direction;
6
+ $layout-direction: $default-layout-direction !global;
7
7
  }
8
8
 
9
9
  @mixin reset-all {
@@ -1,17 +1,17 @@
1
1
  @mixin row($display: block, $direction: $default-layout-direction) {
2
2
  @include clearfix;
3
- $layout-direction: $direction;
3
+ $layout-direction: $direction !global;
4
4
 
5
5
  @if $display == table {
6
6
  display: table;
7
7
  @include fill-parent;
8
8
  table-layout: fixed;
9
- $container-display-table: true;
9
+ $container-display-table: true !global;
10
10
  }
11
11
 
12
12
  @else {
13
13
  display: block;
14
- $container-display-table: false;
14
+ $container-display-table: false !global;
15
15
  }
16
16
  }
17
17
 
@@ -4,7 +4,7 @@
4
4
 
5
5
  @mixin shift-in-context($shift: $columns of $container-columns) {
6
6
  $n-columns: nth($shift, 1);
7
- $parent-columns: container-shift($shift);
7
+ $parent-columns: container-shift($shift) !global;
8
8
 
9
9
  $direction: get-direction($layout-direction, $default-layout-direction);
10
10
  $opposite-direction: get-opposite-direction($direction);
@@ -12,5 +12,5 @@
12
12
  margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
13
13
 
14
14
  // Reset nesting context
15
- $parent-columns: $grid-columns;
15
+ $parent-columns: $grid-columns !global;
16
16
  }
@@ -3,7 +3,7 @@
3
3
  $container-columns: container-span($span);
4
4
 
5
5
  // Set nesting context (used by shift())
6
- $parent-columns: get-parent-columns($container-columns);
6
+ $parent-columns: get-parent-columns($container-columns) !global;
7
7
 
8
8
  $direction: get-direction($layout-direction, $default-layout-direction);
9
9
  $opposite-direction: get-opposite-direction($direction);
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "neat",
3
- "version": "1.6.0.pre",
3
+ "version": "1.6.0.pre2",
4
4
  "homepage": "http://neat.bourbon.io/",
5
5
  "main": "app/assets/stylesheets/_neat.scss",
6
6
  "ignore": [
@@ -15,6 +15,6 @@
15
15
  "NEWS.md"
16
16
  ],
17
17
  "dependencies": {
18
- "bourbon": ">=2.1"
18
+ "bourbon": ">=3.1"
19
19
  }
20
20
  }
data/lib/neat/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Neat
2
- VERSION = '1.6.0.pre'
2
+ VERSION = '1.6.0.pre2'
3
3
  end
data/neat.gemspec CHANGED
@@ -3,29 +3,29 @@ $:.push File.expand_path('../lib', __FILE__)
3
3
  require 'neat/version'
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.name = "neat"
6
+ s.name = 'neat'
7
7
  s.version = Neat::VERSION
8
8
  s.platform = Gem::Platform::RUBY
9
- s.authors = ["Kyle Fiedler", "Reda Lemeden", "Joel Oliveira"]
10
- s.email = ["support@thoughtbot.com"]
11
- s.homepage = "https://github.com/thoughtbot/neat"
12
- s.summary = "A fluid grid framework on top of Bourbon"
9
+ s.authors = ['Kyle Fiedler', 'Reda Lemeden', 'Joel Oliveira']
10
+ s.email = ['support@thoughtbot.com']
11
+ s.homepage = 'https://github.com/thoughtbot/neat'
12
+ s.summary = 'A fluid grid framework on top of Bourbon'
13
13
  s.license = 'MIT'
14
14
  s.description = <<-DESC
15
15
  Neat is an open source grid framework built on top of Bourbon with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
16
16
  DESC
17
17
 
18
- s.rubyforge_project = "neat"
18
+ s.rubyforge_project = 'neat'
19
19
 
20
20
  s.files = `git ls-files`.split("\n")
21
21
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
22
22
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
23
- s.require_paths = ["lib"]
23
+ s.require_paths = ['lib']
24
24
 
25
- s.add_dependency('sass', '>= 3.2')
26
- s.add_dependency('bourbon', '>= 2.1')
25
+ s.add_dependency('sass', '>= 3.3')
26
+ s.add_dependency('bourbon', '>= 3.1')
27
27
 
28
- s.add_development_dependency('aruba', '~> 0.4')
28
+ s.add_development_dependency('aruba', '~> 0.5.0')
29
29
  s.add_development_dependency('rake')
30
30
  s.add_development_dependency('css_parser')
31
31
  s.add_development_dependency('rspec')
@@ -1,7 +1,7 @@
1
1
  module SassSupport
2
2
  def generate_css
3
3
  _mkdir('tmp')
4
- `sass --update test:tmp --style expanded`
4
+ `sass -I . --update test:tmp`
5
5
  end
6
6
 
7
7
  def clean_up
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: neat
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0.pre
4
+ version: 1.6.0.pre2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Fiedler
@@ -10,132 +10,132 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-02-10 00:00:00.000000000 Z
13
+ date: 2014-03-21 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sass
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - '>='
19
+ - - ">="
20
20
  - !ruby/object:Gem::Version
21
- version: '3.2'
21
+ version: '3.3'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - '>='
26
+ - - ">="
27
27
  - !ruby/object:Gem::Version
28
- version: '3.2'
28
+ version: '3.3'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: bourbon
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - '>='
33
+ - - ">="
34
34
  - !ruby/object:Gem::Version
35
- version: '2.1'
35
+ version: '3.1'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - '>='
40
+ - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: '2.1'
42
+ version: '3.1'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: aruba
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ~>
47
+ - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: '0.4'
49
+ version: 0.5.0
50
50
  type: :development
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - ~>
54
+ - - "~>"
55
55
  - !ruby/object:Gem::Version
56
- version: '0.4'
56
+ version: 0.5.0
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: rake
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - '>='
61
+ - - ">="
62
62
  - !ruby/object:Gem::Version
63
63
  version: '0'
64
64
  type: :development
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - '>='
68
+ - - ">="
69
69
  - !ruby/object:Gem::Version
70
70
  version: '0'
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: css_parser
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - '>='
75
+ - - ">="
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - '>='
82
+ - - ">="
83
83
  - !ruby/object:Gem::Version
84
84
  version: '0'
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: rspec
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - '>='
89
+ - - ">="
90
90
  - !ruby/object:Gem::Version
91
91
  version: '0'
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - '>='
96
+ - - ">="
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0'
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: rdoc
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
- - - '>='
103
+ - - ">="
104
104
  - !ruby/object:Gem::Version
105
105
  version: '0'
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
- - - '>='
110
+ - - ">="
111
111
  - !ruby/object:Gem::Version
112
112
  version: '0'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: bundler
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - '>='
117
+ - - ">="
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - '>='
124
+ - - ">="
125
125
  - !ruby/object:Gem::Version
126
126
  version: '0'
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: rb-fsevent
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - ~>
131
+ - - "~>"
132
132
  - !ruby/object:Gem::Version
133
133
  version: 0.9.1
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - ~>
138
+ - - "~>"
139
139
  - !ruby/object:Gem::Version
140
140
  version: 0.9.1
141
141
  description: |
@@ -147,8 +147,8 @@ executables:
147
147
  extensions: []
148
148
  extra_rdoc_files: []
149
149
  files:
150
- - .gitignore
151
- - .rspec
150
+ - ".gitignore"
151
+ - ".rspec"
152
152
  - CONTRIBUTING.md
153
153
  - Gemfile
154
154
  - LICENSE
@@ -216,12 +216,12 @@ require_paths:
216
216
  - lib
217
217
  required_ruby_version: !ruby/object:Gem::Requirement
218
218
  requirements:
219
- - - '>='
219
+ - - ">="
220
220
  - !ruby/object:Gem::Version
221
221
  version: '0'
222
222
  required_rubygems_version: !ruby/object:Gem::Requirement
223
223
  requirements:
224
- - - '>'
224
+ - - ">"
225
225
  - !ruby/object:Gem::Version
226
226
  version: 1.3.1
227
227
  requirements: []