gridle 1.0.9.3 → 1.0.9.4

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5555850d30c1d4dd3e269fddad75eabfe43f25b7
4
- data.tar.gz: 5931f964befad51bcef61f9fae1d18cb077ce170
3
+ metadata.gz: aa631d4f28fa885d928431ebe9eb43d6e11186a6
4
+ data.tar.gz: 9f337dce772c5d961aefc77129ba17956b2d16a2
5
5
  SHA512:
6
- metadata.gz: 248d729e8f88c2265e48072e3a5d95765035f587fb91b09193e75abb0d56f3408aa8ff67274b74fc09877b3aced4cfe592d4b3abde6f637b679bfe56497614d3
7
- data.tar.gz: 2cb83bb5b226fdb96744f9de4caafa0c32a442960c0b0976705809129cc08834927ec3e43dc243e5af78d4a3dec4511f782ab6fb5f829229071672093c041420
6
+ metadata.gz: dced0af914341f4d1fa38f9d83e10d396c448607269436a3a35e6214b6268f395dff9c0248f911ad20849a7d24b63e0c3fc3ead411e050fc33c72e1108cb8d2a
7
+ data.tar.gz: d7ddcecd023925d808cbcfca8bd2a90602ae042a6c35d5e3615800e420b011dacaa8759f5ac855527978a1b9b160398f41f3fee4481678f629eb00db2bd26271
data/lib/gridle.rb CHANGED
@@ -17,7 +17,7 @@ Compass::Frameworks.register('gridle', :path => extension_path)
17
17
  # a prerelease version
18
18
  # Date is in the form of YYYY-MM-DD
19
19
  module Extension
20
- VERSION = "1.0.9.3"
20
+ VERSION = "1.0.9.4"
21
21
  DATE = "2013-11-20"
22
22
  end
23
23
 
@@ -209,15 +209,11 @@ $_gridle-state-15-classes : true !default;
209
209
  -webkit-box-sizing: border-box;
210
210
  -moz-box-sizing: border-box;
211
211
  box-sizing: border-box;
212
-
213
- @extend %gridle-clearfix;
214
212
  }
215
213
  %gridle-parent-common {
216
214
  -webkit-box-sizing: border-box;
217
215
  -moz-box-sizing: border-box;
218
216
  box-sizing: border-box;
219
-
220
- @extend %gridle-clearfix;
221
217
  }
222
218
  %gridle-container-debug-common {
223
219
  background-color:#f5f5f5;
@@ -277,6 +273,7 @@ $_gridle-state-15-classes : true !default;
277
273
 
278
274
  // Common css that cannot be extended cause of variables :
279
275
  @mixin _gridle_container_common() {
276
+ @extend %gridle-clearfix;
280
277
  @extend %gridle-container-common;
281
278
  // debug part :
282
279
  @if ($gridle-debug == true) {
@@ -316,6 +313,7 @@ $_gridle-state-15-classes : true !default;
316
313
  }
317
314
  }
318
315
  @mixin _gridle_parent_common() {
316
+ @extend %gridle-clearfix;
319
317
  @extend %gridle-parent-common;
320
318
  }
321
319
  @mixin _gridle_push_common() {
@@ -1407,9 +1405,6 @@ $_gridle-state-15-classes : true !default;
1407
1405
  #{_gridle_prefixed_class("centered#{$media}")} {
1408
1406
  @include gridle_centered(null);
1409
1407
  }
1410
- #{_gridle_prefixed_class("parent#{$media}")} {
1411
- @include gridle_parent(null);
1412
- }
1413
1408
 
1414
1409
  @if $gridle-debug {
1415
1410
  // debug color classes :
@@ -1486,26 +1481,26 @@ $_gridle-state-15-classes : true !default;
1486
1481
  @for $i from 0 through $gridle-columns-count {
1487
1482
 
1488
1483
  #{_gridle_prefixed_class("grid-#{$i*$gridle-name-multiplicator}")} {
1489
- @include _gridle($i);
1484
+ @include gridle($i);
1490
1485
  }
1491
1486
  @if $gridle-generate-push-classes == true {
1492
1487
  #{_gridle_prefixed_class("push-#{$i*$gridle-name-multiplicator}")} {
1493
- @include _gridle_push($i);
1488
+ @include gridle_push($i);
1494
1489
  }
1495
1490
  }
1496
1491
  @if $gridle-generate-pull-classes == true {
1497
1492
  #{_gridle_prefixed_class("pull-#{$i*$gridle-name-multiplicator}")} {
1498
- @include _gridle_pull($i);
1493
+ @include gridle_pull($i);
1499
1494
  }
1500
1495
  }
1501
1496
  @if $gridle-generate-prefix-classes == true {
1502
1497
  #{_gridle_prefixed_class("prefix-#{$i*$gridle-name-multiplicator}")} {
1503
- @include _gridle_prefix($i);
1498
+ @include gridle_prefix($i);
1504
1499
  }
1505
1500
  }
1506
1501
  @if $gridle-generate-suffix-classes == true {
1507
1502
  #{_gridle_prefixed_class("suffix-#{$i*$gridle-name-multiplicator}")} {
1508
- @include _gridle_suffix($i);
1503
+ @include gridle_suffix($i);
1509
1504
  }
1510
1505
  }
1511
1506
  }
@@ -1513,71 +1508,12 @@ $_gridle-state-15-classes : true !default;
1513
1508
  // helpers classes :
1514
1509
  @if $gridle-generate-helpers-classes == true {
1515
1510
  @include _gridle_generate_helper_classes();
1516
- }
1517
-
1518
- // generate all selector for extends :
1519
- $push-common-selector : ();
1520
- $pull-common-selector : ();
1521
- $prefix-common-selector : ();
1522
- $suffix-common-selector : ();
1523
- $common-selector : ();
1524
- @for $i from 0 through $gridle-columns-count {
1525
- $push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$i*$gridle-name-multiplicator}")}");
1526
- $pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$i*$gridle-name-multiplicator}")}");
1527
- $prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$i*$gridle-name-multiplicator}")}");
1528
- $suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$i*$gridle-name-multiplicator}")}");
1529
- $common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$i*$gridle-name-multiplicator}")}");
1530
-
1531
- // generate all classes for media queries :
1532
- @for $j from 1 through 15 {
1533
- // setup vars :
1534
- $media : _gridle_get_media_query_vars($j,"name");
1535
- $min-width : _gridle_get_media_query_vars($j,"min-width");
1536
- $max-width : _gridle_get_media_query_vars($j,"max-width");
1537
- $classes : _gridle_get_media_query_vars($j,"classes");
1538
- @if $min-width == null { $min-width : 0; }
1539
- @if $max-width == null { $max-width : 999999; }
1540
-
1541
- // generate classes :
1542
- @if $media != null and $classes == true {
1543
-
1544
- $push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$media}-#{$i*$gridle-name-multiplicator}")}");
1545
- $pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$media}-#{$i*$gridle-name-multiplicator}")}");
1546
- $prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$media}-#{$i*$gridle-name-multiplicator}")}");
1547
- $suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$media}-#{$i*$gridle-name-multiplicator}")}");
1548
- $common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$media}-#{$i*$gridle-name-multiplicator}")}");
1549
- }
1550
- }
1551
1511
 
1552
- // generate all classes for usefull states :
1553
- @if $gridle-generate-useful-states-classes != null {
1554
- @each $state in $gridle-generate-useful-states-classes {
1555
- $push-common-selector : $push-common-selector, unquote("#{_gridle_prefixed_class("push-#{$state}-#{$i*$gridle-name-multiplicator}")}");
1556
- $pull-common-selector : $pull-common-selector, unquote("#{_gridle_prefixed_class("pull-#{$state}-#{$i*$gridle-name-multiplicator}")}");
1557
- $prefix-common-selector : $prefix-common-selector, unquote("#{_gridle_prefixed_class("prefix-#{$state}-#{$i*$gridle-name-multiplicator}")}");
1558
- $suffix-common-selector : $suffix-common-selector, unquote("#{_gridle_prefixed_class("suffix-#{$state}-#{$i*$gridle-name-multiplicator}")}");
1559
- $common-selector : $common-selector, unquote("#{_gridle_prefixed_class("grid-#{$state}-#{$i*$gridle-name-multiplicator}")}");
1560
- }
1512
+ #{_gridle_prefixed_class("parent")} {
1513
+ @include gridle_parent();
1561
1514
  }
1562
1515
  }
1563
1516
 
1564
- // extends :
1565
- #{$push-common-selector} {
1566
- @include _gridle_push_common();
1567
- }
1568
- #{$pull-common-selector} {
1569
- @include _gridle_pull_common();
1570
- }
1571
- #{$prefix-common-selector} {
1572
- @include _gridle_prefix_common();
1573
- }
1574
- #{$suffix-common-selector} {
1575
- @include _gridle_suffix_common();
1576
- }
1577
- #{$common-selector} {
1578
- @include _gridle_grid_common();
1579
- }
1580
-
1581
1517
  // generate all classes for differents media queries :
1582
1518
  @for $i from 1 through 15 {
1583
1519
  // setup vars :
@@ -1587,7 +1523,7 @@ $_gridle-state-15-classes : true !default;
1587
1523
  $classes : _gridle_get_media_query_vars($i,"classes");
1588
1524
 
1589
1525
  // generate all media queries grid classes :
1590
- @if $media != null and $classes == true {
1526
+ @if $media and $classes == true {
1591
1527
 
1592
1528
  // manage body query :
1593
1529
  $body-query : _get_media_query_for_state($media);
@@ -1598,42 +1534,79 @@ $_gridle-state-15-classes : true !default;
1598
1534
  $gridle-settings-states : "#{$gridle-settings-states},\"#{$media}\":\"#{$body-query}\"";
1599
1535
  }
1600
1536
  }
1537
+
1538
+ // extend common css :
1539
+ @for $j from 0 through $gridle-columns-count {
1540
+
1541
+ // extend classes :
1542
+ #{_gridle_prefixed_class("grid-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1543
+ @include _gridle_grid_common();
1544
+ }
1545
+ @if $gridle-generate-push-classes == true {
1546
+ #{_gridle_prefixed_class("push-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1547
+ @include _gridle_push_common();
1548
+ }
1549
+ }
1550
+ @if $gridle-generate-pull-classes == true {
1551
+ #{_gridle_prefixed_class("pull-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1552
+ @include _gridle_pull_common();
1553
+ }
1554
+ }
1555
+ @if $gridle-generate-prefix-classes == true {
1556
+ #{_gridle_prefixed_class("prefix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1557
+ @include _gridle_prefix_common();
1558
+ }
1559
+ }
1560
+ @if $gridle-generate-suffix-classes == true {
1561
+ #{_gridle_prefixed_class("suffix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1562
+ @include _gridle_suffix_common();
1563
+ }
1564
+ }
1565
+
1566
+ }
1601
1567
 
1602
1568
  // generate all the classes :
1603
1569
  @include gridle_state($media, null, $has-parent) {
1604
1570
 
1605
- @for $j from 0 through $gridle-columns-count {
1571
+ @for $k from 0 through $gridle-columns-count {
1606
1572
 
1607
- #{_gridle_prefixed_class("grid-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1608
- @include _gridle($j,$media);
1573
+ #{_gridle_prefixed_class("grid-#{$media}-#{$k*$gridle-name-multiplicator}")} {
1574
+ @include _gridle($k,$media);
1609
1575
  }
1610
1576
  @if $gridle-generate-push-classes == true {
1611
- #{_gridle_prefixed_class("push-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1612
- @include _gridle_push($j,$media);
1577
+ #{_gridle_prefixed_class("push-#{$media}-#{$k*$gridle-name-multiplicator}")} {
1578
+ @include _gridle_push($k,$media);
1613
1579
  }
1614
1580
  }
1615
1581
  @if $gridle-generate-pull-classes == true {
1616
- #{_gridle_prefixed_class("pull-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1617
- @include _gridle_pull($j,$media);
1582
+ #{_gridle_prefixed_class("pull-#{$media}-#{$k*$gridle-name-multiplicator}")} {
1583
+ @include _gridle_pull($k,$media);
1618
1584
  }
1619
1585
  }
1620
1586
  @if $gridle-generate-prefix-classes == true {
1621
- #{_gridle_prefixed_class("prefix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1622
- @include _gridle_prefix($j,$media);
1587
+ #{_gridle_prefixed_class("prefix-#{$media}-#{$k*$gridle-name-multiplicator}")} {
1588
+ @include _gridle_prefix($k,$media);
1623
1589
  }
1624
1590
  }
1625
1591
  @if $gridle-generate-suffix-classes == true {
1626
- #{_gridle_prefixed_class("suffix-#{$media}-#{$j*$gridle-name-multiplicator}")} {
1627
- @include _gridle_suffix($j,$media);
1592
+ #{_gridle_prefixed_class("suffix-#{$media}-#{$k*$gridle-name-multiplicator}")} {
1593
+ @include _gridle_suffix($k,$media);
1628
1594
  }
1629
1595
  }
1630
1596
  }
1631
1597
 
1632
- // media queries helpers classes :
1633
- @if $gridle-generate-helpers-classes == true and $media != null {
1598
+ // media queries helpers classes (that not contain extend css) :
1599
+ @if $gridle-generate-helpers-classes == true and $media {
1634
1600
  @include _gridle_generate_helper_classes($media);
1635
1601
  }
1636
1602
  }
1603
+
1604
+ // helpers that have extend in them (can not been in the @media) :
1605
+ @if $gridle-generate-helpers-classes == true and $media {
1606
+ #{_gridle_prefixed_class("parent-#{$media}")} {
1607
+ @include gridle_parent($media);
1608
+ }
1609
+ }
1637
1610
  }
1638
1611
  }
1639
1612
 
@@ -1647,40 +1620,78 @@ $_gridle-state-15-classes : true !default;
1647
1620
  $gridle-settings-states : "#{$gridle-settings-states},\"#{$state}\":\"#{$body-query}\"";
1648
1621
  }
1649
1622
 
1623
+ // extend common css :
1624
+ @for $l from 0 through $gridle-columns-count {
1625
+
1626
+ // extend classes :
1627
+ #{_gridle_prefixed_class("grid-#{$state}-#{$l*$gridle-name-multiplicator}")} {
1628
+ @include _gridle_grid_common();
1629
+ }
1630
+ @if $gridle-generate-push-classes == true {
1631
+ #{_gridle_prefixed_class("push-#{$state}-#{$l*$gridle-name-multiplicator}")} {
1632
+ @include _gridle_push_common();
1633
+ }
1634
+ }
1635
+ @if $gridle-generate-pull-classes == true {
1636
+ #{_gridle_prefixed_class("pull-#{$state}-#{$l*$gridle-name-multiplicator}")} {
1637
+ @include _gridle_pull_common();
1638
+ }
1639
+ }
1640
+ @if $gridle-generate-prefix-classes == true {
1641
+ #{_gridle_prefixed_class("prefix-#{$state}-#{$l*$gridle-name-multiplicator}")} {
1642
+ @include _gridle_prefix_common();
1643
+ }
1644
+ }
1645
+ @if $gridle-generate-suffix-classes == true {
1646
+ #{_gridle_prefixed_class("suffix-#{$state}-#{$l*$gridle-name-multiplicator}")} {
1647
+ @include _gridle_suffix_common();
1648
+ }
1649
+ }
1650
+
1651
+ }
1652
+
1650
1653
  // creating classes :
1651
1654
  @include gridle_state($state, null, $has-parent) {
1652
1655
 
1653
- @for $k from 0 through $gridle-columns-count {
1656
+ @for $m from 0 through $gridle-columns-count {
1654
1657
 
1655
- #{_gridle_prefixed_class("grid-#{$state}-#{$k*$gridle-name-multiplicator}")} {
1656
- @include _gridle($k,$state);
1658
+ #{_gridle_prefixed_class("grid-#{$state}-#{$m*$gridle-name-multiplicator}")} {
1659
+ @include _gridle($m,$state);
1657
1660
  }
1658
1661
  @if $gridle-generate-push-classes == true {
1659
- #{_gridle_prefixed_class("push-#{$state}-#{$k*$gridle-name-multiplicator}")} {
1660
- @include _gridle_push($k,$state);
1662
+ #{_gridle_prefixed_class("push-#{$state}-#{$m*$gridle-name-multiplicator}")} {
1663
+ @include _gridle_push($m,$state);
1661
1664
  }
1662
1665
  }
1663
1666
  @if $gridle-generate-pull-classes == true {
1664
- #{_gridle_prefixed_class("pull-#{$state}-#{$k*$gridle-name-multiplicator}")} {
1665
- @include _gridle_pull($k,$state);
1667
+ #{_gridle_prefixed_class("pull-#{$state}-#{$m*$gridle-name-multiplicator}")} {
1668
+ @include _gridle_pull($m,$state);
1666
1669
  }
1667
1670
  }
1668
1671
  @if $gridle-generate-prefix-classes == true {
1669
- #{_gridle_prefixed_class("prefix-#{$state}-#{$k*$gridle-name-multiplicator}")} {
1670
- @include _gridle_prefix($k,$state);
1672
+ #{_gridle_prefixed_class("prefix-#{$state}-#{$m*$gridle-name-multiplicator}")} {
1673
+ @include _gridle_prefix($m,$state);
1671
1674
  }
1672
1675
  }
1673
1676
  @if $gridle-generate-suffix-classes == true {
1674
- #{_gridle_prefixed_class("suffix-#{$state}-#{$k*$gridle-name-multiplicator}")} {
1675
- @include _gridle_suffix($k,$state);
1677
+ #{_gridle_prefixed_class("suffix-#{$state}-#{$m*$gridle-name-multiplicator}")} {
1678
+ @include _gridle_suffix($m,$state);
1676
1679
  }
1677
1680
  }
1678
1681
  }
1679
1682
 
1683
+ // media queries helpers classes (that not contain extend css) :
1680
1684
  @if $gridle-generate-helpers-classes == true {
1681
1685
  @include _gridle_generate_helper_classes($state);
1682
1686
  }
1683
1687
  }
1688
+
1689
+ // helpers that have extend in them (can not been in the @media) :
1690
+ @if $gridle-generate-helpers-classes == true {
1691
+ #{_gridle_prefixed_class("parent-#{$state}")} {
1692
+ @include gridle_parent($state);
1693
+ }
1694
+ }
1684
1695
  }
1685
1696
  }
1686
1697
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gridle
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9.3
4
+ version: 1.0.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Olivier Bossel