neat-compass 1.5.1 → 1.6.0
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.
- data/stylesheets/neat/_neat.scss +1 -1
- data/stylesheets/neat/functions/_new-breakpoint.scss +1 -1
- data/stylesheets/neat/functions/_private.scss +1 -1
- data/stylesheets/neat/grid/_media.scss +5 -5
- data/stylesheets/neat/grid/_private.scss +2 -2
- data/stylesheets/neat/grid/_reset.scss +2 -2
- data/stylesheets/neat/grid/_row.scss +3 -3
- data/stylesheets/neat/grid/_shift.scss +2 -2
- data/stylesheets/neat/grid/_span-columns.scss +1 -1
- metadata +4 -4
data/stylesheets/neat/_neat.scss
CHANGED
@@ -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);
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: neat-compass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.6.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-
|
12
|
+
date: 2014-03-28 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: compass
|
@@ -50,7 +50,7 @@ dependencies:
|
|
50
50
|
requirements:
|
51
51
|
- - ! '>='
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version: '3.
|
53
|
+
version: '3.3'
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -58,7 +58,7 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - ! '>='
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '3.
|
61
|
+
version: '3.3'
|
62
62
|
description: thoughtbot's Neat packaged as a Compass extension.
|
63
63
|
email: jed@jedfoster.com
|
64
64
|
executables: []
|