flint-gs 2.0.8 → 2.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/flint/version.rb +1 -1
- data/stylesheets/flint/mixins/lib/_calculate.scss +2 -2
- data/tests/input/functions/lib/_instance.scss +21 -21
- data/tests/output/output.css +20 -15
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2ff75d19ed91efb3b3547b703bed3475066e24a3
|
|
4
|
+
data.tar.gz: e6103e6116eda13164e4352360fcb6af7217c83c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 851b23551999aadcd0dda308d5bbf5b61f0a8e71fbeaa6c7daec63f5fbb22bda7188f12abe5813fb4c7dbb7b1e3cacca4ed983244e1f21f10f453b4ad3813f71
|
|
7
|
+
data.tar.gz: b64913e085a83166cb46bf84cf2780ba270b67d4073e5a02143343cad6705530acd92ce8d9bcabd1b94f33f952bac97fe51a5c11e805a0d5cc4078748b386994
|
data/lib/flint/version.rb
CHANGED
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
|
|
22
22
|
@if flint-get-value("settings", "grid") == "fluid" {
|
|
23
23
|
width: flint-fluid-width(map-get($width, "target"), map-get($width, "context"));
|
|
24
|
-
margin-right: if($margin-right != 0, flint-fluid-width($margin-right, map-get($width, "context")),
|
|
25
|
-
margin-left: if($margin-left != 0, flint-fluid-width($margin-left, map-get($width, "context")),
|
|
24
|
+
margin-right: if(flint-is-number($margin-right) and $margin-right != 0, flint-fluid-width($margin-right, map-get($width, "context")), $margin-right);
|
|
25
|
+
margin-left: if(flint-is-number($margin-left) and $margin-left != 0, flint-fluid-width($margin-left, map-get($width, "context")), $margin-left);
|
|
26
26
|
} @else {
|
|
27
27
|
width: map-get($width, "target");
|
|
28
28
|
margin-right: $margin-right;
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"columns": 4,
|
|
55
55
|
"span": 2,
|
|
56
56
|
"context": 4,
|
|
57
|
-
"gutter":
|
|
57
|
+
"gutter": normal,
|
|
58
58
|
"internal": (
|
|
59
59
|
"width": 8.125em,
|
|
60
60
|
"margin-right": 0.625em,
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
"columns": 8,
|
|
70
70
|
"span": 2,
|
|
71
71
|
"context": 4,
|
|
72
|
-
"gutter":
|
|
72
|
+
"gutter": normal,
|
|
73
73
|
"internal": (
|
|
74
|
-
"width": 8.
|
|
74
|
+
"width": 8.4375em,
|
|
75
75
|
"margin-right": 0.625em,
|
|
76
76
|
"margin-left": 0.625em
|
|
77
77
|
)
|
|
@@ -84,9 +84,9 @@
|
|
|
84
84
|
"columns": 12,
|
|
85
85
|
"span": 2,
|
|
86
86
|
"context": 4,
|
|
87
|
-
"gutter":
|
|
87
|
+
"gutter": inside,
|
|
88
88
|
"internal": (
|
|
89
|
-
"width":
|
|
89
|
+
"width": 7.1875em,
|
|
90
90
|
"margin-right": 0.625em,
|
|
91
91
|
"margin-left": 0.625em
|
|
92
92
|
)
|
|
@@ -99,11 +99,11 @@
|
|
|
99
99
|
"columns": 16,
|
|
100
100
|
"span": 2,
|
|
101
101
|
"context": 4,
|
|
102
|
-
"gutter":
|
|
102
|
+
"gutter": row,
|
|
103
103
|
"internal": (
|
|
104
|
-
"width":
|
|
105
|
-
"margin-right": 0
|
|
106
|
-
"margin-left": 0
|
|
104
|
+
"width": 9.375em,
|
|
105
|
+
"margin-right": 0,
|
|
106
|
+
"margin-left": 0
|
|
107
107
|
)
|
|
108
108
|
),
|
|
109
109
|
".parent-instance::mobile": (
|
|
@@ -114,11 +114,11 @@
|
|
|
114
114
|
"columns": 4,
|
|
115
115
|
"span": 4,
|
|
116
116
|
"context": null,
|
|
117
|
-
"gutter":
|
|
117
|
+
"gutter": center,
|
|
118
118
|
"internal": (
|
|
119
119
|
"width": 18.75em,
|
|
120
|
-
"margin-right":
|
|
121
|
-
"margin-left":
|
|
120
|
+
"margin-right": auto,
|
|
121
|
+
"margin-left": auto
|
|
122
122
|
)
|
|
123
123
|
),
|
|
124
124
|
".parent-instance::tablet": (
|
|
@@ -129,10 +129,10 @@
|
|
|
129
129
|
"columns": 8,
|
|
130
130
|
"span": 4,
|
|
131
131
|
"context": null,
|
|
132
|
-
"gutter":
|
|
132
|
+
"gutter": omega,
|
|
133
133
|
"internal": (
|
|
134
|
-
"width":
|
|
135
|
-
"margin-right": 0
|
|
134
|
+
"width": 19.375em,
|
|
135
|
+
"margin-right": 0,
|
|
136
136
|
"margin-left": 0.625em
|
|
137
137
|
)
|
|
138
138
|
),
|
|
@@ -144,11 +144,11 @@
|
|
|
144
144
|
"columns": 12,
|
|
145
145
|
"span": 4,
|
|
146
146
|
"context": null,
|
|
147
|
-
"gutter":
|
|
147
|
+
"gutter": alpha,
|
|
148
148
|
"internal": (
|
|
149
|
-
"width":
|
|
149
|
+
"width": 19.375em,
|
|
150
150
|
"margin-right": 0.625em,
|
|
151
|
-
"margin-left": 0
|
|
151
|
+
"margin-left": 0
|
|
152
152
|
)
|
|
153
153
|
),
|
|
154
154
|
".parent-instance::desktop": (
|
|
@@ -159,7 +159,7 @@
|
|
|
159
159
|
"columns": 16,
|
|
160
160
|
"span": 4,
|
|
161
161
|
"context": null,
|
|
162
|
-
"gutter":
|
|
162
|
+
"gutter": normal,
|
|
163
163
|
"internal": (
|
|
164
164
|
"width": 18.75em,
|
|
165
165
|
"margin-right": 0.625em,
|
|
@@ -169,10 +169,10 @@
|
|
|
169
169
|
);
|
|
170
170
|
|
|
171
171
|
.parent-instance {
|
|
172
|
-
@include _(4);
|
|
172
|
+
@include _(4, $gutter: normal alpha omega center);
|
|
173
173
|
|
|
174
174
|
.child-instance {
|
|
175
|
-
@include _(2, "auto");
|
|
175
|
+
@include _(2, "auto", $gutter: row inside normal normal);
|
|
176
176
|
|
|
177
177
|
@at-root {
|
|
178
178
|
@include it("should expect instance map to match pseudo instance map") {
|
data/tests/output/output.css
CHANGED
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
.parent-instance {
|
|
15
15
|
float: left;
|
|
16
16
|
width: 93.75%;
|
|
17
|
-
margin-right:
|
|
18
|
-
margin-left:
|
|
17
|
+
margin-right: auto;
|
|
18
|
+
margin-left: auto;
|
|
19
19
|
}
|
|
20
20
|
@media (min-width: 60.0625em) {
|
|
21
21
|
.parent-instance {
|
|
@@ -26,18 +26,23 @@
|
|
|
26
26
|
}
|
|
27
27
|
@media (min-width: 40.0625em) and (max-width: 60em) {
|
|
28
28
|
.parent-instance {
|
|
29
|
-
width:
|
|
29
|
+
width: 32.29167%;
|
|
30
30
|
margin-right: 1.04167%;
|
|
31
|
-
margin-left:
|
|
31
|
+
margin-left: 0;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
@media (min-width: 20.0625em) and (max-width: 40em) {
|
|
35
35
|
.parent-instance {
|
|
36
|
-
width:
|
|
37
|
-
margin-right:
|
|
36
|
+
width: 48.4375%;
|
|
37
|
+
margin-right: 0;
|
|
38
38
|
margin-left: 1.5625%;
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
+
@media (min-width: 0) and (max-width: 20em) {
|
|
42
|
+
.parent-instance {
|
|
43
|
+
float: none;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
41
46
|
.parent-instance .child-instance {
|
|
42
47
|
float: left;
|
|
43
48
|
width: 43.33333%;
|
|
@@ -46,23 +51,23 @@
|
|
|
46
51
|
}
|
|
47
52
|
@media (min-width: 60.0625em) {
|
|
48
53
|
.parent-instance .child-instance {
|
|
49
|
-
width:
|
|
50
|
-
margin-right:
|
|
51
|
-
margin-left:
|
|
54
|
+
width: 50%;
|
|
55
|
+
margin-right: 0;
|
|
56
|
+
margin-left: 0;
|
|
52
57
|
}
|
|
53
58
|
}
|
|
54
59
|
@media (min-width: 40.0625em) and (max-width: 60em) {
|
|
55
60
|
.parent-instance .child-instance {
|
|
56
|
-
width:
|
|
57
|
-
margin-right: 3.
|
|
58
|
-
margin-left: 3.
|
|
61
|
+
width: 37.09677%;
|
|
62
|
+
margin-right: 3.22581%;
|
|
63
|
+
margin-left: 3.22581%;
|
|
59
64
|
}
|
|
60
65
|
}
|
|
61
66
|
@media (min-width: 20.0625em) and (max-width: 40em) {
|
|
62
67
|
.parent-instance .child-instance {
|
|
63
|
-
width: 43.
|
|
64
|
-
margin-right: 3.
|
|
65
|
-
margin-left: 3.
|
|
68
|
+
width: 43.54839%;
|
|
69
|
+
margin-right: 3.22581%;
|
|
70
|
+
margin-left: 3.22581%;
|
|
66
71
|
}
|
|
67
72
|
}
|
|
68
73
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: flint-gs
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ezekiel Gabrielse
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-10-
|
|
11
|
+
date: 2014-10-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|