Converted to 'default media' setting

at-import · Aug 24, 2014 · ac8f6f5 · ac8f6f5
1 parent 1ba76eb
commit ac8f6f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/stylesheets/breakpoint/_context.scss b/stylesheets/breakpoint/_context.scss
@@ -34,7 +34,7 @@ $private-breakpoint-query-count: 0 !default;
  }
  @else {
  @if breakpoint-has-context() and $feature == 'media' {
- @return $breakpoint-default-media;
+ @return breakpoint-get('default media');
  }
  @else {
  @return false;
@@ -59,7 +59,7 @@ $private-breakpoint-query-count: 0 !default;
  $v-holder: ();
  @for $i from 1 to $private-breakpoint-query-count {
  @if $feature == 'media' {
- $v-holder: append($v-holder, $breakpoint-default-media);
+ $v-holder: append($v-holder, breakpoint-get('default media'));
  }
  @else {
  $v-holder: append($v-holder, false);
@@ -73,7 +73,7 @@ $private-breakpoint-query-count: 0 !default;
  $length: length($v-holder);
  @for $i from $length to $private-breakpoint-query-count - 1 {
  @if $feature == 'media' {
- $v-holder: append($v-holder, $breakpoint-default-media);
+ $v-holder: append($v-holder, breakpoint-get('default media'));
  }
  @else {
  $v-holder: append($v-holder, false);

diff --git a/stylesheets/breakpoint/_parsers.scss b/stylesheets/breakpoint/_parsers.scss
@@ -112,11 +112,11 @@ $Memo-Exists: function-exists(memo-get) and function-exists(memo-set);
  // Set up Media Type
  $query-print: '';
 
- $force-all: (($breakpoint-force-media-all == true) and ($breakpoint-default-media == 'all'));
+ $force-all: (($breakpoint-force-media-all == true) and (breakpoint-get('default media') == 'all'));
  $empty-media: true;
- @if ($force-all == true) or ($breakpoint-default-media != 'all') {
+ @if ($force-all == true) or (breakpoint-get('default media') != 'all') {
  // Force the print of the default media type if (force all is true and default media type is all) or (default media type is not all)
- $query-print: $breakpoint-default-media;
+ $query-print: breakpoint-get('default media');
  $empty-media: false;
  }
 
@@ -201,7 +201,7 @@ $Memo-Exists: function-exists(memo-get) and function-exists(memo-set);
  @if length($v-holder) < $private-breakpoint-query-count {
  @for $i from $length to $private-breakpoint-query-count {
  @if $f == 'media' {
- $v-holder: append($v-holder, $breakpoint-default-media);
+ $v-holder: append($v-holder, breakpoint-get('default media'));
  }
  @else {
  $v-holder: append($v-holder, false);