gridle 1.3.29 → 1.3.32

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: cc0de88b3051757dc948acc3bf43f7040eeac03c
4
- data.tar.gz: 59dd262b6ff7969e13b1abdec39215cf826592f4
3
+ metadata.gz: f16aa6ac68623dabed23586e2672a5ea50e958fb
4
+ data.tar.gz: e18e1935d3e0c0ef03761b0fb7e2566a179268c4
5
5
  SHA512:
6
- metadata.gz: 533f1b2160466fee09163b37e271cfa2f483c237f8ac9461e02c9f2af3354201abffdcf321c462487a440b9733162667e8656656aa7b963545386ff8f2d7cc0c
7
- data.tar.gz: fab65351c02cd0dfa3fb33fdce5b36998206906513524b3b2f9d599f3aeeb6d77d55ad41cf9b3882686bf493eb6c60276423ca5d3241e817508e7478915c9bd2
6
+ metadata.gz: 36fbccefae4ca51786949b96023d8fa13331000f12175c9e9e5bd8e9420c73338a61bf55c8cd44598a76585fb860ff5c869c730e71219cef673248bfc5b9b1a9
7
+ data.tar.gz: a115b76aedbe02dde0e272612615a0b96d0166be239c38d5a1fb619b94d9a598e8dfd341eb686b68ce93ec61713e391164393286d93d2b1c9e35b28a2f93bc5a
@@ -17,8 +17,8 @@ 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.3.29"
21
- DATE = "2014-07-22"
20
+ VERSION = "1.3.32"
21
+ DATE = "2014-09-02"
22
22
  end
23
23
 
24
24
  # This is where any custom SassScript should be placed. The functions will be
@@ -6,7 +6,7 @@
6
6
 
7
7
  // retina
8
8
  @include gridle_register_state("retina", (
9
- query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)",
9
+ query : "(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 2dppx)",
10
10
  classes : false
11
11
  ) );
12
12
 
@@ -57,6 +57,12 @@
57
57
  @return map-merge($_gridle-settings, $stateMap-or-stateName);
58
58
  }
59
59
 
60
+ // return the default one if exist
61
+ @if map-has-key($_gridle_states, default)
62
+ {
63
+ @return map-get($_gridle_states, default);
64
+ }
65
+
60
66
  // nothing finded, return the default state :
61
67
  @return $_gridle-settings;
62
68
  }
@@ -29,13 +29,13 @@
29
29
  // |------------------------------------------------------
30
30
  // |------------------------------------------------------
31
31
  // @created 25.03.13
32
- // @updated 22.07.14
32
+ // @updated 02.09.14
33
33
  // @author Olivier Bossel <olivier.bossel@gmail.com>
34
- // @version 1.3.29
34
+ // @version 1.3.32
35
35
  // |------------------------------------------------------
36
36
  // |------------------------------------------------------
37
37
 
38
- $_gridle-version : "1.3.29";
38
+ $_gridle-version : "1.3.32";
39
39
 
40
40
 
41
41
 
@@ -4,6 +4,92 @@
4
4
  // |------------------------------------------------------
5
5
  // |------------------------------------------------------
6
6
 
7
+ // Helper to apply multiple config for a certain state with one mixin
8
+ @mixin gridle_set(
9
+ $settings,
10
+ $state : default
11
+ ) {
12
+
13
+ // loop on each settings
14
+ @each $settingName, $settingValue in $settings
15
+ {
16
+ $sn : unquote($settingName);
17
+ $sv : $settingValue;
18
+
19
+ // check if setting name is a state :
20
+ @if _gridle_has_state($sn) {
21
+ // process the state
22
+ @include gridle_set($sv, $sn);
23
+ } @else {
24
+ @if $sn == container {
25
+ @include gridle_container($state);
26
+ } @else if $sn == grid {
27
+ @include gridle($sv, $state);
28
+ } @else if $sn == push {
29
+ @include gridle_push($sv, $state);
30
+ } @else if $sn == pull {
31
+ @include gridle_pull($sv, $state);
32
+ } @else if $sn == prefix {
33
+ @include gridle_prefix($sv, $state);
34
+ } @else if $sn == suffix {
35
+ @include gridle_suffix($sv, $state);
36
+ } @else if $sn == pull {
37
+ @include gridle_pull($sv, $state);
38
+ } @else if $sn == clear_each {
39
+ @include gridle_clear_each(nth($sv,1), nth($sv,2), $state);
40
+ } @else if $sn == centered {
41
+ @include gridle_centered($state);
42
+ } @else if $sn == parent {
43
+ @include gridle_parent($state);
44
+ } @else if $sn == vertical_align {
45
+ @include gridle_vertical_align($sv, $state);
46
+ } @else if $sn == hide {
47
+ @if $sv == true {
48
+ @include gridle_hide($state);
49
+ } @else {
50
+ @include gridle_show($state);
51
+ }
52
+ } @else if $sn == show {
53
+ @if $sv == true {
54
+ @include gridle_show($state);
55
+ } @else {
56
+ @include gridle_hide($state);
57
+ }
58
+ } @else if $sn == visible {
59
+ @if $sv == true {
60
+ @include gridle_visible($state);
61
+ } @else {
62
+ @include gridle_not_visible($state);
63
+ }
64
+ } @else if $sn == not_visible {
65
+ @if $sv == true {
66
+ @include gridle_not_visible($state);
67
+ } @else {
68
+ @include gridle_visible($state);
69
+ }
70
+ } @else if $sn == show_inline {
71
+ @if $sv == true {
72
+ @include gridle_show_inline($state);
73
+ } @else {
74
+ @include gridle_hide($state);
75
+ }
76
+ } @else if $sn == float {
77
+ @include gridle_float($sv, $state);
78
+ } @else if $sn == clear {
79
+ @include gridle_clear($sv, $state);
80
+ } @else if $sn == no_gutter
81
+ or $sn == no_margin {
82
+ @include gridle_no_gutter($sv, $state);
83
+ } @else if $sn == gutter
84
+ or $sn == margin {
85
+ @include gridle_gutter($sv, $state);
86
+ } @else {
87
+ // we do nothing
88
+ }
89
+ }
90
+ }
91
+ }
92
+
7
93
  // Responsive helpers mixins :
8
94
  @mixin gridle_state(
9
95
  $states,
@@ -29,7 +29,7 @@
29
29
  generate-prefix-classes : true,
30
30
  generate-suffix-classes : true,
31
31
  generate-helpers-classes : true
32
- ), $settings);
32
+ ), $settings) !global;
33
33
 
34
34
  // register default state :
35
35
  @include gridle_register_state(default, $_gridle-settings);
@@ -48,7 +48,7 @@
48
48
  $settings : map-set($settings, name, $name);
49
49
 
50
50
  // add state in maps :
51
- $_gridle_states : map-set($_gridle_states, $name, $settings);
51
+ $_gridle_states : map-set($_gridle_states, $name, $settings) !global;
52
52
  }
53
53
 
54
54
 
@@ -66,7 +66,7 @@
66
66
  );
67
67
 
68
68
  // append to map :
69
- $_gridle_clear_classes : map-set($_gridle_clear_classes, $count, $classMap);
69
+ $_gridle_clear_classes : map-set($_gridle_clear_classes, $count, $classMap) !global;
70
70
  }
71
71
 
72
72
 
@@ -82,7 +82,7 @@
82
82
  $col : _gridle_create_column($name, $columns, $context);
83
83
 
84
84
  // add column in maps :
85
- $_gridle_columns : map-set($_gridle_columns, $name, $col);
85
+ $_gridle_columns : map-set($_gridle_columns, $name, $col) !global;
86
86
  }
87
87
 
88
88
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gridle
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.29
4
+ version: 1.3.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Olivier Bossel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-22 00:00:00.000000000 Z
11
+ date: 2014-09-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass