Make code around $breakpoint-legacy-syntax more DRY.

at-import · Sep 17, 2013 · a568e74 · a568e74
1 parent 158d00f
commit a568e74
Showing 1 changed file with 8 additions and 22 deletions.
diff --git a/stylesheets/_breakpoint.scss b/stylesheets/_breakpoint.scss
@@ -47,7 +47,10 @@ $breakpoint-legacy-syntax: false !default;
  $query-fallback: false;
 
 
- @if ($or-list != false and $breakpoint-legacy-syntax == false) {
+ @if ($or-list == false and $breakpoint-legacy-syntax == false) {
+ $query-string: breakpoint-parse($query);
+ }
+ @else {
  $length: length($query);
 
  $last: nth($query, $length);
@@ -57,27 +60,7 @@ $breakpoint-legacy-syntax: false !default;
  $length: $length - 1;
  }
 
-
- @for $i from 1 through $length {
- @if $i == 1 {
- $query-string: breakpoint-parse(nth($query, $i));
- }
- @else {
- $query-string: $query-string + ', ' + breakpoint-parse(nth($query, $i));
- }
- }
- }
- @else {
  @if ($breakpoint-legacy-syntax == true) {
- $length: length($query);
-
- $last: nth($query, $length);
- $query-fallback: breakpoint-no-query($last);
-
- @if ($query-fallback != false) {
- $length: $length - 1;
- }
-
  $mq: ();
 
  @for $i from 1 through $length {
@@ -87,7 +70,10 @@ $breakpoint-legacy-syntax: false !default;
  $query-string: breakpoint-parse($mq);
  }
  @else {
- $query-string: breakpoint-parse($query);
+ $query-string: '';
+ @for $i from 1 through $length {
+ $query-string: $query-string + if($i == 1, '', ', ') + breakpoint-parse(nth($query, $i));
+ }
  }
  }