modular-scale 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc09fa2379f131d6f1a73d0e549fe17d13603196
-  data.tar.gz: e040091ffa1183f998473052a6084ffbe9b71ff5
+  metadata.gz: 046c2bbc74504a6714922aa2ec24b3bde0239a42
+  data.tar.gz: 8353d90b9502fdc663c404c925f71cca7e0c9596
 SHA512:
-  metadata.gz: 761cfc5df949d1de71e3e54e38e450e213ebcb6789dc335047d6fb0a407886528ce5d338a1970130ed0a14a29b9e8b9a60fa2f1513a40eb07dbe5852d7ac8ffa
-  data.tar.gz: a88ddbbb8ab25fac1ceb8af781d1f6d4eb360f9990cde18034b0b23cf597960083f89921a9336676fbbf9d72993b5e802a507aa08b63b776e6c2ad8858057451
+  metadata.gz: 29ce6e0c37e1f70edc359929094bc2b9bf863d01329d84d6b0bdb89feb08e917ad66dbe81ea8340fffcebe90855a4b2e6a07936822ba5906241fc858895f9b63
+  data.tar.gz: 4e7345d6f1c58b1d490e24d98fb5af614eb0a26e4ace57c179da4f91170a30d4259e9d9bc6a339fd13b758a15d141803f552957d48f5922938a38947e5f185b7

data/changelog.md

@@ -1,3 +1,7 @@
+# Version 2.1.1
+
+  Bugfix an `@else if` statement.
+
 # Version 2.1.0
 
   Ground-up re-write of ms-respond based on http://madebymike.com.au/writing/precise-control-responsive-typography/

data/lib/modular-scale.rb

@@ -16,7 +16,7 @@ Compass::Frameworks.register('modular-scale', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module ModularScale
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
   DATE = "2013-12-20"
 end
 

data/readme.md

@@ -14,16 +14,16 @@ To get started, you need to select a ratio and a base value. The base value is u
 * Compass config: `require 'modular-scale'`
 * SCSS: `@import 'modular-scale';`
 
-### Bower
-
-* Terminal: `bower install modular-scale --save-dev`
-* SCSS: `@import '../link_to_component_dir/modular-scale';`
-
 ### Eyeglass
 
 * Terminal: `npm install modularscale-sass --save-dev`
 * SCSS: `@import 'modular-scale'`
 
+### Bower
+
+* Terminal: `bower install modular-scale --save-dev`
+* SCSS: `@import '../link_to_component_dir/modular-scale';`
+
 ### Vanilla Sass
 
 * [Download the latest zip](https://github.com/Team-Sass/modular-scale/releases/latest)
@@ -170,7 +170,7 @@ foo {
 
 ## [Changelog](https://github.com/Team-Sass/modular-scale/releases)
 
-### Licence
+### License
 
 The MIT License (MIT)
 

data/stylesheets/modular-scale/_respond.scss

@@ -34,12 +34,14 @@
     // Initial value
     #{$property}: ms($value,$base,ms-range(1,1,$range));
 
-    //
+    // Loop through breakpoints
     @for $i from 1 through (length($range) - 1) {
       @media (min-width: ms-range($i,2,$range)) and (max-width: ms-range($i+1,2,$range)) {
         #{$property}: ms-respond-calc($value, $i, $range, $base);
       }
     }
+
+    // Final breakpoint is just an override value
     @media (min-width: ms-range(length($range),2,$range)) {
       #{$property}: ms($value,$base,ms-range(length($range),1,$range));
     }

data/stylesheets/modular-scale/_sort-list.scss

@@ -2,9 +2,9 @@
 // http://en.wikipedia.org/wiki/Merge_sort
 
 @function ms-merge($A, $B) {
-  
+
   $Return: ();
-  
+
   // Some empty lists get passed through
   // so just pass the other list throguh
   @if length($A) == 0 {
@@ -19,28 +19,28 @@
   @if nth($B, length($B)) < nth($A, 1) {
     @return join($B, $A);
   }
-  
+
   // Counters start at 1
   $A-counter: 1;
   $B-counter: 1;
-  
+
   // Start looping through all numbers in array
   @while $A-counter <= length($A) and $B-counter <= length($B) {
-    
+
     // Check if the A value is smaller
     // Uses or equal to avoid duplicate numbers
     @if nth($A, $A-counter) <= nth($B, $B-counter) {
       $Return: join($Return, nth($A, $A-counter));
       $A-counter: $A-counter + 1;
     }
-    
+
     // Check if the B value is smaller
-    @elseif nth($A, $A-counter) > nth($B, $B-counter) {
+    @else if nth($A, $A-counter) > nth($B, $B-counter) {
       $Return: join($Return, nth($B, $B-counter));
       $B-counter: $B-counter + 1;
     }
   }
-  
+
   // Run through remainder values in the list
   @while $A-counter <= length($A) {
     $Current: nth($A, $A-counter);
@@ -56,7 +56,7 @@
     }
     $B-counter: $B-counter + 1;
   }
-  
+
   // Done! return is now sorted and complete
   @return $Return;
 }
@@ -65,7 +65,7 @@
 
 // Pull it all together
 @function ms-sort-list($Lists) {
-  
+
   $Return: ();
 
   @each $List in $Lists {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Scott Kellum
@@ -56,6 +56,7 @@ files:
 - stylesheets/modular-scale/_round-px.scss
 - stylesheets/modular-scale/_sort-list.scss
 - stylesheets/modular-scale/_tests.scss
+- stylesheets/modular-scale.zip
 - changelog.md
 - license.md
 - readme.md