gridle 1.2.1 → 1.3.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.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/gridle.rb +2 -2
  3. data/stylesheets/gridle/_common-mixins.scss +51 -35
  4. data/stylesheets/gridle/_functions.scss +109 -67
  5. data/stylesheets/gridle/_generate-mixins.scss +63 -117
  6. data/stylesheets/gridle/_gridle.scss +4 -3
  7. data/stylesheets/gridle/_mixins.scss +186 -180
  8. data/stylesheets/gridle/_settings-mixins.scss +58 -63
  9. data/stylesheets/gridle/_settings.scss +0 -20
  10. metadata +2 -2
data/stylesheets/gridle/_settings-mixins.scss CHANGED
@@ -4,51 +4,50 @@
4
4
  // |------------------------------------------------------
5
5
  // |------------------------------------------------------
6
6
 
7
+ /**
8
+ * Setup
9
+ */
10
+ @mixin gridle_setup(
11
+ $settings : ()
12
+ ) {
13
+ $_gridle-settings : map-merge((
14
+ min-width : 0,
15
+ max-width : 99999999px,
16
+ query : null,
17
+ classes : true,
18
+ context : 12,
19
+ gutter-width : 20px,
20
+ direction : ltr,
21
+ name-multiplicator : 1,
22
+ debug : false,
23
+ debug-show-class-names : true,
24
+ ie7-support : false,
25
+ html-states-classes : false,
26
+ generate-push-classes : true,
27
+ generate-pull-classes : true,
28
+ generate-prefix-classes : true,
29
+ generate-suffix-classes : true,
30
+ generate-helpers-classes : true
31
+ ), $settings);
32
+
33
+ // register default state :
34
+ @include gridle_register_state(default, $_gridle-settings);
35
+
36
+ }
37
+
7
38
  // Register an state :
8
39
  @mixin gridle_register_state(
9
40
  $name,
10
- $min-width-or-query : null,
11
- $max-width-or-classes-generation : null,
12
- $classes-generation : true,
13
- $context : $gridle-columns-count
41
+ $settings
14
42
  ) {
15
- // process variables :
16
- $name : $name;
17
- $min-width : null;
18
- $max-width : null;
19
- $query : null;
20
- $classes : true;
21
- $context : $context;
22
- @if type-of($min-width-or-query) == string {
23
- $query : $min-width-or-query;
24
- } @else {
25
- @if $min-width-or-query {
26
- $min-width : $min-width-or-query;
27
- }
28
- }
29
- @if type-of($max-width-or-classes-generation) == bool {
30
- $classes : $max-width-or-classes-generation;
31
- } @else {
32
- @if $max-width-or-classes-generation {
33
- $max-width : $max-width-or-classes-generation;
34
- }
35
- $classes : $classes-generation;
36
- }
43
+ // settings :
44
+ $settings : map-merge($_gridle-settings, $settings);
37
45
 
38
- // creating state :
39
- $state : (
40
- $name : (
41
- name : $name,
42
- min-width : $min-width,
43
- max-width : $max-width,
44
- query : $query,
45
- classes : $classes,
46
- context : $context
47
- )
48
- );
46
+ // set name :
47
+ $settings : map-set($settings, name, $name);
49
48
 
50
49
  // add state in maps :
51
- $_gridle_states : map-merge($_gridle_states, $state);
50
+ $_gridle_states : map-set($_gridle_states, $name, $settings);
52
51
  }
53
52
 
54
53
 
@@ -76,11 +75,10 @@
76
75
  @mixin gridle_register_column(
77
76
  $name,
78
77
  $columns,
79
- $context,
80
- $generateClasses : true
78
+ $context
81
79
  ) {
82
80
  // create a column :
83
- $col : _gridle_create_column($name, $columns, $context, $generateClasses);
81
+ $col : _gridle_create_column($name, $columns, $context);
84
82
 
85
83
  // add column in maps :
86
84
  $_gridle_columns : map-set($_gridle_columns, $name, $col);
@@ -91,9 +89,13 @@
91
89
  * Register default states
92
90
  */
93
91
  @mixin gridle_register_default_states() {
94
- // register mobile and tablet states :
95
- @include gridle_register_state("mobile",null,480px);
96
- @include gridle_register_state("tablet",481px,1024px);
92
+ @include gridle_register_state(mobile, (
93
+ max-width : 480px
94
+ ));
95
+ @include gridle_register_state(tablet, (
96
+ min-width : 481px,
97
+ max-width : 1024px
98
+ ));
97
99
  }
98
100
 
99
101
 
@@ -101,25 +103,18 @@
101
103
  * Register default mobile first states :
102
104
  */
103
105
  @mixin gridle_register_default_mobile_first_states() {
104
- @include gridle_register_state("xs", null, 768px);
105
- @include gridle_register_state("sm", 768px, null);
106
- @include gridle_register_state("md", 992px, null);
107
- @include gridle_register_state("lg", 1200px, null);
108
- }
109
-
110
-
111
- /**
112
- * Set the context for a particular state
113
- *
114
- * @param String $state The state to update
115
- * @param int $context The new context to set
116
- */
117
- @mixin gridle_set_context_for_state(
118
- $state,
119
- $context
120
- ) {
121
- // set context in state :
122
- $var : _gridle_set_state_var($state, "context", $context);
106
+ @include gridle_register_state(xs, (
107
+ max-width : 768px
108
+ ));
109
+ @include gridle_register_state(sm, (
110
+ min-width : 768px
111
+ ));
112
+ @include gridle_register_state(md, (
113
+ min-width : 992px
114
+ ));
115
+ @include gridle_register_state(lg, (
116
+ min-width : 1200px
117
+ ));
123
118
  }
124
119
 
125
120
 
data/stylesheets/gridle/_settings.scss CHANGED
@@ -4,26 +4,6 @@
4
4
  // |------------------------------------------------------
5
5
  // |------------------------------------------------------
6
6
 
7
- // gridle configuration vars :
8
- $gridle-columns-count : 12 !default;
9
- $gridle-gutter-width : 20px !default;
10
- $gridle-gutter-type : padding !default;
11
- $gridle-name-multiplicator : 1 !default;
12
- $gridle-direction : ltr !default;
13
-
14
- $gridle-debug : false !default;
15
- $gridle-debug-show-class-names : true !default;
16
-
17
- $gridle-ie7-support : false !default;
18
-
19
- $gridle-html-states-classes : false !default;
20
-
21
- $gridle-generate-helpers-classes : true !default;
22
- $gridle-generate-push-classes : true !default;
23
- $gridle-generate-pull-classes : true !default;
24
- $gridle-generate-prefix-classes : true !default;
25
- $gridle-generate-suffix-classes : true !default;
26
-
27
7
  $gridle-debug-selector : ".gridle-debug &, &.gridle-debug" !default;
28
8
 
29
9
  $gridle-class-prefix : '' !default;
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.2.1
4
+ version: 1.3.0
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-05-13 00:00:00.000000000 Z
11
+ date: 2014-05-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass