diff options
-rw-r--r-- | src/_props.scss | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/_props.scss b/src/_props.scss index fdb3591..ec10b1f 100644 --- a/src/_props.scss +++ b/src/_props.scss | |||
@@ -98,14 +98,16 @@ | |||
98 | $value: get(list.nth($ref, 3)); | 98 | $value: get(list.nth($ref, 3)); |
99 | $meta: get(list.nth($ref, 4)); | 99 | $meta: get(list.nth($ref, 4)); |
100 | 100 | ||
101 | $match: $match-meta == null; | 101 | $match: true; |
102 | @if meta.type-of($match-meta) == 'list' { | 102 | @if meta.type-of($match-meta) == 'list' { |
103 | @each $item in $match-meta { | 103 | @each $item in $match-meta { |
104 | $match: $match or list.index($meta, $match-meta) != null; | 104 | $match: $match and list.index($meta, $item) != null; |
105 | } | 105 | } |
106 | } @else { | ||
107 | $match: $match and list.index($meta, $match-meta) != null; | ||
106 | } | 108 | } |
107 | 109 | ||
108 | @if $match { | 110 | @if $match-meta == null or $match { |
109 | @include materialize-helper($name, $value); | 111 | @include materialize-helper($name, $value); |
110 | } | 112 | } |
111 | } @else if meta.type-of($ref) == 'list' { | 113 | } @else if meta.type-of($ref) == 'list' { |
@@ -115,14 +117,16 @@ | |||
115 | $value: get(list.nth($r, 3)); | 117 | $value: get(list.nth($r, 3)); |
116 | $meta: get(list.nth($r, 4)); | 118 | $meta: get(list.nth($r, 4)); |
117 | 119 | ||
118 | $match: $match-meta == null; | 120 | $match: true; |
119 | @if meta.type-of($match-meta) == 'list' { | 121 | @if meta.type-of($match-meta) == 'list' { |
120 | @each $item in $match-meta { | 122 | @each $item in $match-meta { |
121 | $match: $match or list.index($meta, $match-meta) != null; | 123 | $match: $match and list.index($meta, $item) != null; |
122 | } | 124 | } |
125 | } @else { | ||
126 | $match: $match and list.index($meta, $match-meta) != null; | ||
123 | } | 127 | } |
124 | 128 | ||
125 | @if $match { | 129 | @if $match-meta == null or $match { |
126 | @include materialize-helper($name, $value); | 130 | @include materialize-helper($name, $value); |
127 | } | 131 | } |
128 | } | 132 | } |