diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/_contexts.scss | 2 | ||||
-rw-r--r-- | src/_easing.scss | 52 | ||||
-rw-r--r-- | src/_harmony.scss | 6 | ||||
-rw-r--r-- | src/_props.scss | 4 | ||||
-rw-r--r-- | src/_responsive.scss | 72 | ||||
-rw-r--r-- | src/bem/_element.scss | 30 | ||||
-rw-r--r-- | src/bem/_modifier.scss | 18 | ||||
-rw-r--r-- | src/bem/_state.scss | 6 |
8 files changed, 105 insertions, 85 deletions
diff --git a/src/_contexts.scss b/src/_contexts.scss index 8542056..7ffbb4e 100644 --- a/src/_contexts.scss +++ b/src/_contexts.scss | |||
@@ -194,7 +194,7 @@ $stacks: (); | |||
194 | } | 194 | } |
195 | 195 | ||
196 | @mixin assert-stack-must-contain($stack-id, $context-ids, $check-head-only: false) { | 196 | @mixin assert-stack-must-contain($stack-id, $context-ids, $check-head-only: false) { |
197 | $noop: assert-stack-must-contain($stack-id, $context-ids, $check-head-only) | 197 | $noop: assert-stack-must-contain($stack-id, $context-ids, $check-head-only); |
198 | } | 198 | } |
199 | 199 | ||
200 | /// | 200 | /// |
diff --git a/src/_easing.scss b/src/_easing.scss index 8b06632..8bcfd39 100644 --- a/src/_easing.scss +++ b/src/_easing.scss | |||
@@ -24,7 +24,7 @@ $cubic-bezier-sample-pool-size: 10 !default; | |||
24 | /// | 24 | /// |
25 | /// Minimum slope required to use the Newton-Raphson method for cubic bezier calculations. | 25 | /// Minimum slope required to use the Newton-Raphson method for cubic bezier calculations. |
26 | /// | 26 | /// |
27 | $cubic-bezier-newton-min-slope: 0.001 !default; | 27 | $cubic-bezier-newton-min-slope: .001 !default; |
28 | 28 | ||
29 | /// | 29 | /// |
30 | /// Number of iterations of the Newton-Raphson method. | 30 | /// Number of iterations of the Newton-Raphson method. |
@@ -34,7 +34,7 @@ $cubic-bezier-newton-iters: 4 !default; | |||
34 | /// | 34 | /// |
35 | /// Precision of the subdivision method for cubic bezier calculations. | 35 | /// Precision of the subdivision method for cubic bezier calculations. |
36 | /// | 36 | /// |
37 | $cubic-bezier-subdiv-precision: 0.0000001 !default; | 37 | $cubic-bezier-subdiv-precision: .0000001 !default; |
38 | 38 | ||
39 | /// | 39 | /// |
40 | /// Maximum iterations of the subdivision method for cubic bezier calculations. | 40 | /// Maximum iterations of the subdivision method for cubic bezier calculations. |
@@ -217,7 +217,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
217 | /// @return {number} | 217 | /// @return {number} |
218 | /// | 218 | /// |
219 | @function ease($x) { | 219 | @function ease($x) { |
220 | @return cubic-bezier(0.25, 0.1, 0.25, 1, $x); | 220 | @return cubic-bezier(.25, .1, .25, 1, $x); |
221 | } | 221 | } |
222 | 222 | ||
223 | /// | 223 | /// |
@@ -228,7 +228,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
228 | /// @return {number} | 228 | /// @return {number} |
229 | /// | 229 | /// |
230 | @function ease-in($x) { | 230 | @function ease-in($x) { |
231 | @return cubic-bezier(0.42, 0, 1, 1, $x); | 231 | @return cubic-bezier(.42, 0, 1, 1, $x); |
232 | } | 232 | } |
233 | 233 | ||
234 | /// | 234 | /// |
@@ -239,7 +239,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
239 | /// @return {number} | 239 | /// @return {number} |
240 | /// | 240 | /// |
241 | @function ease-out($x) { | 241 | @function ease-out($x) { |
242 | @return cubic-bezier(0, 0, 0.58, 1, $x); | 242 | @return cubic-bezier(0, 0, .58, 1, $x); |
243 | } | 243 | } |
244 | 244 | ||
245 | /// | 245 | /// |
@@ -250,7 +250,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
250 | /// @return {number} | 250 | /// @return {number} |
251 | /// | 251 | /// |
252 | @function ease-in-out($x) { | 252 | @function ease-in-out($x) { |
253 | @return cubic-bezier(0.42, 0, 0.58, 1, $x); | 253 | @return cubic-bezier(.42, 0, .58, 1, $x); |
254 | } | 254 | } |
255 | 255 | ||
256 | /// | 256 | /// |
@@ -261,7 +261,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
261 | /// @return {number} | 261 | /// @return {number} |
262 | /// | 262 | /// |
263 | @function ease-in-sine($x) { | 263 | @function ease-in-sine($x) { |
264 | @return cubic-bezier(0.47, 0, 0.745, 0.715, $x); | 264 | @return cubic-bezier(.47, 0, .745, .715, $x); |
265 | } | 265 | } |
266 | 266 | ||
267 | /// | 267 | /// |
@@ -272,7 +272,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
272 | /// @return {number} | 272 | /// @return {number} |
273 | /// | 273 | /// |
274 | @function ease-out-sine($x) { | 274 | @function ease-out-sine($x) { |
275 | @return cubic-bezier(0.39, 0.575, 0.565, 1, $x); | 275 | @return cubic-bezier(.39, .575, .565, 1, $x); |
276 | } | 276 | } |
277 | 277 | ||
278 | /// | 278 | /// |
@@ -283,7 +283,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
283 | /// @return {number} | 283 | /// @return {number} |
284 | /// | 284 | /// |
285 | @function ease-in-out-sine($x) { | 285 | @function ease-in-out-sine($x) { |
286 | @return cubic-bezier(0.445, 0.05, 0.55, 0.95, $x); | 286 | @return cubic-bezier(.445, .05, .55, .95, $x); |
287 | } | 287 | } |
288 | 288 | ||
289 | /// | 289 | /// |
@@ -294,7 +294,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
294 | /// @return {number} | 294 | /// @return {number} |
295 | /// | 295 | /// |
296 | @function ease-in-quad($x) { | 296 | @function ease-in-quad($x) { |
297 | @return cubic-bezier(0.55, 0.085, 0.68, 0.53, $x); | 297 | @return cubic-bezier(.55, .085, .68, .53, $x); |
298 | } | 298 | } |
299 | 299 | ||
300 | /// | 300 | /// |
@@ -305,7 +305,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
305 | /// @return {number} | 305 | /// @return {number} |
306 | /// | 306 | /// |
307 | @function ease-out-quad($x) { | 307 | @function ease-out-quad($x) { |
308 | @return cubic-bezier(0.25, 0.46, 0.45, 0.94, $x); | 308 | @return cubic-bezier(.25, .46, .45, .94, $x); |
309 | } | 309 | } |
310 | 310 | ||
311 | /// | 311 | /// |
@@ -316,7 +316,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
316 | /// @return {number} | 316 | /// @return {number} |
317 | /// | 317 | /// |
318 | @function ease-in-out-quad($x) { | 318 | @function ease-in-out-quad($x) { |
319 | @return cubic-bezier(0.455, 0.03, 0.515, 0.955, $x); | 319 | @return cubic-bezier(.455, .03, .515, .955, $x); |
320 | } | 320 | } |
321 | 321 | ||
322 | /// | 322 | /// |
@@ -327,7 +327,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
327 | /// @return {number} | 327 | /// @return {number} |
328 | /// | 328 | /// |
329 | @function ease-in-cubic($x) { | 329 | @function ease-in-cubic($x) { |
330 | @return cubic-bezier(0.55, 0.055, 0.675, 0.19, $x); | 330 | @return cubic-bezier(.55, .055, .675, .19, $x); |
331 | } | 331 | } |
332 | 332 | ||
333 | /// | 333 | /// |
@@ -338,7 +338,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
338 | /// @return {number} | 338 | /// @return {number} |
339 | /// | 339 | /// |
340 | @function ease-out-cubic($x) { | 340 | @function ease-out-cubic($x) { |
341 | @return cubic-bezier(0.215, 0.61, 0.355, 1, $x); | 341 | @return cubic-bezier(.215, .61, .355, 1, $x); |
342 | } | 342 | } |
343 | 343 | ||
344 | /// | 344 | /// |
@@ -349,7 +349,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
349 | /// @return {number} | 349 | /// @return {number} |
350 | /// | 350 | /// |
351 | @function ease-in-out-cubic($x) { | 351 | @function ease-in-out-cubic($x) { |
352 | @return cubic-bezier(0.645, 0.045, 0.355, 1, $x); | 352 | @return cubic-bezier(.645, .045, .355, 1, $x); |
353 | } | 353 | } |
354 | 354 | ||
355 | /// | 355 | /// |
@@ -360,7 +360,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
360 | /// @return {number} | 360 | /// @return {number} |
361 | /// | 361 | /// |
362 | @function ease-in-quart($x) { | 362 | @function ease-in-quart($x) { |
363 | @return cubic-bezier(0.895, 0.03, 0.685, 0.22, $x); | 363 | @return cubic-bezier(.895, .03, .685, .22, $x); |
364 | } | 364 | } |
365 | 365 | ||
366 | /// | 366 | /// |
@@ -371,7 +371,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
371 | /// @return {number} | 371 | /// @return {number} |
372 | /// | 372 | /// |
373 | @function ease-out-quart($x) { | 373 | @function ease-out-quart($x) { |
374 | @return cubic-bezier(0.165, 0.84, 0.44, 1, $x); | 374 | @return cubic-bezier(.165, .84, .44, 1, $x); |
375 | } | 375 | } |
376 | 376 | ||
377 | /// | 377 | /// |
@@ -382,7 +382,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
382 | /// @return {number} | 382 | /// @return {number} |
383 | /// | 383 | /// |
384 | @function ease-in-out-quart($x) { | 384 | @function ease-in-out-quart($x) { |
385 | @return cubic-bezier(0.77, 0, 0.175, 1, $x); | 385 | @return cubic-bezier(.77, 0, .175, 1, $x); |
386 | } | 386 | } |
387 | 387 | ||
388 | /// | 388 | /// |
@@ -393,7 +393,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
393 | /// @return {number} | 393 | /// @return {number} |
394 | /// | 394 | /// |
395 | @function ease-in-quint($x) { | 395 | @function ease-in-quint($x) { |
396 | @return cubic-bezier(0.755, 0.05, 0.855, 0.06, $x); | 396 | @return cubic-bezier(.755, .05, .855, .06, $x); |
397 | } | 397 | } |
398 | 398 | ||
399 | /// | 399 | /// |
@@ -404,7 +404,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
404 | /// @return {number} | 404 | /// @return {number} |
405 | /// | 405 | /// |
406 | @function ease-out-quint($x) { | 406 | @function ease-out-quint($x) { |
407 | @return cubic-bezier(0.23, 1, 0.32, 1, $x); | 407 | @return cubic-bezier(.23, 1, .32, 1, $x); |
408 | } | 408 | } |
409 | 409 | ||
410 | /// | 410 | /// |
@@ -415,7 +415,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
415 | /// @return {number} | 415 | /// @return {number} |
416 | /// | 416 | /// |
417 | @function ease-in-out-quint($x) { | 417 | @function ease-in-out-quint($x) { |
418 | @return cubic-bezier(0.86, 0, 0.07, 1, $x); | 418 | @return cubic-bezier(.86, 0, .07, 1, $x); |
419 | } | 419 | } |
420 | 420 | ||
421 | /// | 421 | /// |
@@ -426,7 +426,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
426 | /// @return {number} | 426 | /// @return {number} |
427 | /// | 427 | /// |
428 | @function ease-in-expo($x) { | 428 | @function ease-in-expo($x) { |
429 | @return cubic-bezier(0.95, 0.05, 0.795, 0.035, $x); | 429 | @return cubic-bezier(.95, .05, .795, .035, $x); |
430 | } | 430 | } |
431 | 431 | ||
432 | /// | 432 | /// |
@@ -437,7 +437,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
437 | /// @return {number} | 437 | /// @return {number} |
438 | /// | 438 | /// |
439 | @function ease-out-expo($x) { | 439 | @function ease-out-expo($x) { |
440 | @return cubic-bezier(0.19, 1, 0.22, 1, $x); | 440 | @return cubic-bezier(.19, 1, .22, 1, $x); |
441 | } | 441 | } |
442 | 442 | ||
443 | /// | 443 | /// |
@@ -459,7 +459,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
459 | /// @return {number} | 459 | /// @return {number} |
460 | /// | 460 | /// |
461 | @function ease-in-circ($x) { | 461 | @function ease-in-circ($x) { |
462 | @return cubic-bezier(0.6, 0.04, 0.98, 0.335, $x); | 462 | @return cubic-bezier(.6, .04, .98, .335, $x); |
463 | } | 463 | } |
464 | 464 | ||
465 | /// | 465 | /// |
@@ -470,7 +470,7 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
470 | /// @return {number} | 470 | /// @return {number} |
471 | /// | 471 | /// |
472 | @function ease-out-circ($x) { | 472 | @function ease-out-circ($x) { |
473 | @return cubic-bezier(0.075, 0.82, 0.165, 1, $x); | 473 | @return cubic-bezier(.075, .82, .165, 1, $x); |
474 | } | 474 | } |
475 | 475 | ||
476 | /// | 476 | /// |
@@ -481,5 +481,5 @@ $cubic-bezier-subdiv-max-iters: 10 !default; | |||
481 | /// @return {number} | 481 | /// @return {number} |
482 | /// | 482 | /// |
483 | @function ease-in-out-circ($x) { | 483 | @function ease-in-out-circ($x) { |
484 | @return cubic-bezier(0.785, 0.135, 0.15, 0.86, $x); | 484 | @return cubic-bezier(.785, .135, .15, .86, $x); |
485 | } | 485 | } |
diff --git a/src/_harmony.scss b/src/_harmony.scss index 839036c..aaab726 100644 --- a/src/_harmony.scss +++ b/src/_harmony.scss | |||
@@ -89,9 +89,11 @@ | |||
89 | $new-map: (); | 89 | $new-map: (); |
90 | 90 | ||
91 | @each $key, $value in $responsive-map { | 91 | @each $key, $value in $responsive-map { |
92 | $new-map: map-merge($new-map, ( | 92 | $new-map: map-merge( |
93 | $new-map, ( | ||
93 | $key: modular-scale($times, $value...) | 94 | $key: modular-scale($times, $value...) |
94 | )); | 95 | ) |
96 | ); | ||
95 | } | 97 | } |
96 | 98 | ||
97 | @include responsive.property($props, $new-map, $fluid); | 99 | @include responsive.property($props, $new-map, $fluid); |
diff --git a/src/_props.scss b/src/_props.scss index cdb96c2..db24dff 100644 --- a/src/_props.scss +++ b/src/_props.scss | |||
@@ -121,7 +121,7 @@ $namespace-context-id: 'namespace' !default; | |||
121 | $ns-key: get-ns-key(); | 121 | $ns-key: get-ns-key(); |
122 | 122 | ||
123 | @if $ns-key != null { | 123 | @if $ns-key != null { |
124 | $map: ($ns-key: $map) | 124 | $map: ($ns-key: $map); |
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
@@ -303,7 +303,7 @@ $namespace-context-id: 'namespace' !default; | |||
303 | $map: map-remove($map, $skip...); | 303 | $map: map-remove($map, $skip...); |
304 | 304 | ||
305 | @if type-of($prefix) == list { | 305 | @if type-of($prefix) == list { |
306 | $prefix: functions.str-implode($prefix) | 306 | $prefix: functions.str-implode($prefix); |
307 | } | 307 | } |
308 | 308 | ||
309 | @if not $global { | 309 | @if not $global { |
diff --git a/src/_responsive.scss b/src/_responsive.scss index 9520dfc..c907085 100644 --- a/src/_responsive.scss +++ b/src/_responsive.scss | |||
@@ -182,11 +182,11 @@ $context-id: 'responsive' !default; | |||
182 | $last-vp: nth($viewports, length($viewports)); | 182 | $last-vp: nth($viewports, length($viewports)); |
183 | 183 | ||
184 | @include contexts.push($context-id, 'env', ( | 184 | @include contexts.push($context-id, 'env', ( |
185 | 'viewports': $viewports, | 185 | 'viewports': $viewports, |
186 | 'mode': set, | 186 | 'mode': set, |
187 | 'index': 1, | 187 | 'index': 1, |
188 | 'fluid': $fluid, | 188 | 'fluid': $fluid, |
189 | 'vertical': $vertical, | 189 | 'vertical': $vertical, |
190 | )); | 190 | )); |
191 | 191 | ||
192 | @content; | 192 | @content; |
@@ -200,11 +200,11 @@ $context-id: 'responsive' !default; | |||
200 | @if not $vertical { | 200 | @if not $vertical { |
201 | @media (min-width: $prev-vp) and (max-width: $next-vp) { | 201 | @media (min-width: $prev-vp) and (max-width: $next-vp) { |
202 | @include contexts.push($context-id, 'env', ( | 202 | @include contexts.push($context-id, 'env', ( |
203 | 'viewports': $viewports, | 203 | 'viewports': $viewports, |
204 | 'mode': transition, | 204 | 'mode': transition, |
205 | 'index': $i, | 205 | 'index': $i, |
206 | 'fluid': $fluid, | 206 | 'fluid': $fluid, |
207 | 'vertical': $vertical, | 207 | 'vertical': $vertical, |
208 | )); | 208 | )); |
209 | 209 | ||
210 | @content; | 210 | @content; |
@@ -214,11 +214,11 @@ $context-id: 'responsive' !default; | |||
214 | } @else { | 214 | } @else { |
215 | @media (min-height: $prev-vp) and (max-height: $next-vp) { | 215 | @media (min-height: $prev-vp) and (max-height: $next-vp) { |
216 | @include contexts.push($context-id, 'env', ( | 216 | @include contexts.push($context-id, 'env', ( |
217 | 'viewports': $viewports, | 217 | 'viewports': $viewports, |
218 | 'mode': transition, | 218 | 'mode': transition, |
219 | 'index': $i, | 219 | 'index': $i, |
220 | 'fluid': $fluid, | 220 | 'fluid': $fluid, |
221 | 'vertical': $vertical, | 221 | 'vertical': $vertical, |
222 | )); | 222 | )); |
223 | 223 | ||
224 | @content; | 224 | @content; |
@@ -231,11 +231,11 @@ $context-id: 'responsive' !default; | |||
231 | @if not $vertical { | 231 | @if not $vertical { |
232 | @media (min-width: $last-vp) { | 232 | @media (min-width: $last-vp) { |
233 | @include contexts.push($context-id, 'env', ( | 233 | @include contexts.push($context-id, 'env', ( |
234 | 'viewports': $viewports, | 234 | 'viewports': $viewports, |
235 | 'mode': set, | 235 | 'mode': set, |
236 | 'index': length($viewports), | 236 | 'index': length($viewports), |
237 | 'fluid': $fluid, | 237 | 'fluid': $fluid, |
238 | 'vertical': $vertical, | 238 | 'vertical': $vertical, |
239 | )); | 239 | )); |
240 | 240 | ||
241 | @content; | 241 | @content; |
@@ -245,11 +245,11 @@ $context-id: 'responsive' !default; | |||
245 | } @else { | 245 | } @else { |
246 | @media (min-height: $last-vp) { | 246 | @media (min-height: $last-vp) { |
247 | @include contexts.push($context-id, 'env', ( | 247 | @include contexts.push($context-id, 'env', ( |
248 | 'viewports': $viewports, | 248 | 'viewports': $viewports, |
249 | 'mode': set, | 249 | 'mode': set, |
250 | 'index': length($viewports), | 250 | 'index': length($viewports), |
251 | 'fluid': $fluid, | 251 | 'fluid': $fluid, |
252 | 'vertical': $vertical, | 252 | 'vertical': $vertical, |
253 | )); | 253 | )); |
254 | 254 | ||
255 | @content; | 255 | @content; |
@@ -259,11 +259,11 @@ $context-id: 'responsive' !default; | |||
259 | } | 259 | } |
260 | } @else { | 260 | } @else { |
261 | @include contexts.push($context-id, 'env', ( | 261 | @include contexts.push($context-id, 'env', ( |
262 | 'viewports': $viewports, | 262 | 'viewports': $viewports, |
263 | 'mode': set, | 263 | 'mode': set, |
264 | 'index': 1, | 264 | 'index': 1, |
265 | 'fluid': $fluid, | 265 | 'fluid': $fluid, |
266 | 'vertical': $vertical, | 266 | 'vertical': $vertical, |
267 | )); | 267 | )); |
268 | 268 | ||
269 | @content; | 269 | @content; |
@@ -276,9 +276,9 @@ $context-id: 'responsive' !default; | |||
276 | @if not $vertical { | 276 | @if not $vertical { |
277 | @media (min-width: $vp) { | 277 | @media (min-width: $vp) { |
278 | @include contexts.push($context-id, 'env', ( | 278 | @include contexts.push($context-id, 'env', ( |
279 | 'viewports': $viewports, | 279 | 'viewports': $viewports, |
280 | 'mode': set, | 280 | 'mode': set, |
281 | 'index': $i | 281 | 'index': $i |
282 | )); | 282 | )); |
283 | 283 | ||
284 | @content; | 284 | @content; |
@@ -288,9 +288,9 @@ $context-id: 'responsive' !default; | |||
288 | } @else { | 288 | } @else { |
289 | @media (min-height: $vp) { | 289 | @media (min-height: $vp) { |
290 | @include contexts.push($context-id, 'env', ( | 290 | @include contexts.push($context-id, 'env', ( |
291 | 'viewports': $viewports, | 291 | 'viewports': $viewports, |
292 | 'mode': set, | 292 | 'mode': set, |
293 | 'index': $i | 293 | 'index': $i |
294 | )); | 294 | )); |
295 | 295 | ||
296 | @content; | 296 | @content; |
diff --git a/src/bem/_element.scss b/src/bem/_element.scss index 84e85fb..25377d6 100644 --- a/src/bem/_element.scss +++ b/src/bem/_element.scss | |||
@@ -147,10 +147,12 @@ | |||
147 | @each $name in join($name, $names) { | 147 | @each $name in join($name, $names) { |
148 | $sel: selector-append(&, vars.$element-separator + $name); | 148 | $sel: selector-append(&, vars.$element-separator + $name); |
149 | $selector: join($selector, $sel, comma); | 149 | $selector: join($selector, $sel, comma); |
150 | $parts-data: append($parts-data, ( | 150 | $parts-data: append( |
151 | $parts-data, ( | ||
151 | 'name': $name, | 152 | 'name': $name, |
152 | 'selector': $sel | 153 | 'selector': $sel |
153 | )); | 154 | ) |
155 | ); | ||
154 | } | 156 | } |
155 | } | 157 | } |
156 | 158 | ||
@@ -170,10 +172,12 @@ | |||
170 | @each $name in join($name, $names) { | 172 | @each $name in join($name, $names) { |
171 | $sel: selector-append(&, vars.$element-separator + $name); | 173 | $sel: selector-append(&, vars.$element-separator + $name); |
172 | $selector: join($selector, $sel, comma); | 174 | $selector: join($selector, $sel, comma); |
173 | $parts-data: append($parts-data, ( | 175 | $parts-data: append( |
176 | $parts-data, ( | ||
174 | 'name': $name, | 177 | 'name': $name, |
175 | 'selector': $sel | 178 | 'selector': $sel |
176 | )); | 179 | ) |
180 | ); | ||
177 | } | 181 | } |
178 | } @else { | 182 | } @else { |
179 | // | 183 | // |
@@ -191,10 +195,12 @@ | |||
191 | @each $name in join($name, $names) { | 195 | @each $name in join($name, $names) { |
192 | $sel: selector-nest(&, selector-append($block-base-selector, vars.$element-separator + $name)); | 196 | $sel: selector-nest(&, selector-append($block-base-selector, vars.$element-separator + $name)); |
193 | $selector: join($selector, $sel, comma); | 197 | $selector: join($selector, $sel, comma); |
194 | $parts-data: append($parts-data, ( | 198 | $parts-data: append( |
199 | $parts-data, ( | ||
195 | 'name': $name, | 200 | 'name': $name, |
196 | 'selector': $sel | 201 | 'selector': $sel |
197 | )); | 202 | ) |
203 | ); | ||
198 | } | 204 | } |
199 | } | 205 | } |
200 | } | 206 | } |
@@ -336,10 +342,12 @@ | |||
336 | @each $name in join($name, $names) { | 342 | @each $name in join($name, $names) { |
337 | $sel: selector-nest(&, $sign, selector-append($block-base-selector, vars.$element-separator + $name)); | 343 | $sel: selector-nest(&, $sign, selector-append($block-base-selector, vars.$element-separator + $name)); |
338 | $selector: join($selector, $sel, comma); | 344 | $selector: join($selector, $sel, comma); |
339 | $parts-data: append($parts-data, ( | 345 | $parts-data: append( |
346 | $parts-data, ( | ||
340 | 'name': $name, | 347 | 'name': $name, |
341 | 'selector': $sel | 348 | 'selector': $sel |
342 | )); | 349 | ) |
350 | ); | ||
343 | } | 351 | } |
344 | 352 | ||
345 | $context: 'element', ( | 353 | $context: 'element', ( |
@@ -562,10 +570,12 @@ | |||
562 | } | 570 | } |
563 | 571 | ||
564 | $selector: join($selector, $sel, comma); | 572 | $selector: join($selector, $sel, comma); |
565 | $parts-data: append($parts-data, ( | 573 | $parts-data: append( |
574 | $parts-data, ( | ||
566 | 'name': $part-name, | 575 | 'name': $part-name, |
567 | 'selector': $sel | 576 | 'selector': $sel |
568 | )); | 577 | ) |
578 | ); | ||
569 | } | 579 | } |
570 | 580 | ||
571 | $context: 'element', ( | 581 | $context: 'element', ( |
diff --git a/src/bem/_modifier.scss b/src/bem/_modifier.scss index be65e47..07267fe 100644 --- a/src/bem/_modifier.scss +++ b/src/bem/_modifier.scss | |||
@@ -177,10 +177,12 @@ | |||
177 | 177 | ||
178 | $sel: selector-append(&, vars.$modifier-separator + $name); | 178 | $sel: selector-append(&, vars.$modifier-separator + $name); |
179 | $selector: join($selector, $sel, comma); | 179 | $selector: join($selector, $sel, comma); |
180 | $parts-data: append($parts-data, ( | 180 | $parts-data: append( |
181 | $parts-data, ( | ||
181 | 'name': $name, | 182 | 'name': $name, |
182 | 'selector': $sel | 183 | 'selector': $sel |
183 | )); | 184 | ) |
185 | ); | ||
184 | } @else { | 186 | } @else { |
185 | // | 187 | // |
186 | // Parent context is modifier, suffix or state and $extend is false. | 188 | // Parent context is modifier, suffix or state and $extend is false. |
@@ -219,10 +221,12 @@ | |||
219 | } | 221 | } |
220 | 222 | ||
221 | $selector: join($selector, $nsel, comma); | 223 | $selector: join($selector, $nsel, comma); |
222 | $parts-data: append($parts-data, ( | 224 | $parts-data: append( |
225 | $parts-data, ( | ||
223 | 'name': $name, | 226 | 'name': $name, |
224 | 'selector': $nsel | 227 | 'selector': $nsel |
225 | )); | 228 | ) |
229 | ); | ||
226 | } @else { | 230 | } @else { |
227 | // | 231 | // |
228 | // Latest context is block. Just append the modifier part. | 232 | // Latest context is block. Just append the modifier part. |
@@ -234,10 +238,12 @@ | |||
234 | 238 | ||
235 | $sel: selector-append(&, $block-base-selector, vars.$modifier-separator + $name); | 239 | $sel: selector-append(&, $block-base-selector, vars.$modifier-separator + $name); |
236 | $selector: join($selector, $sel, comma); | 240 | $selector: join($selector, $sel, comma); |
237 | $parts-data: append($parts-data, ( | 241 | $parts-data: append( |
242 | $parts-data, ( | ||
238 | 'name': $name, | 243 | 'name': $name, |
239 | 'selector': $sel | 244 | 'selector': $sel |
240 | )); | 245 | ) |
246 | ); | ||
241 | } | 247 | } |
242 | } | 248 | } |
243 | } | 249 | } |
diff --git a/src/bem/_state.scss b/src/bem/_state.scss index 2d430bf..41bacee 100644 --- a/src/bem/_state.scss +++ b/src/bem/_state.scss | |||
@@ -91,10 +91,12 @@ | |||
91 | $sel: selector-append(&, $sel); | 91 | $sel: selector-append(&, $sel); |
92 | } | 92 | } |
93 | $selector: join($selector, $sel, comma); | 93 | $selector: join($selector, $sel, comma); |
94 | $parts-data: append($parts-data, ( | 94 | $parts-data: append( |
95 | $parts-data, ( | ||
95 | 'name': $state, | 96 | 'name': $state, |
96 | 'selector': $sel | 97 | 'selector': $sel |
97 | )); | 98 | ) |
99 | ); | ||
98 | } | 100 | } |
99 | 101 | ||
100 | $context: 'state', ( | 102 | $context: 'state', ( |