modular-scale 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8e832ec7e2ce31126a42b3353df0769f799602
-  data.tar.gz: 4b07f42a8745961ca7aafbf69484ed9438465ea1
+  metadata.gz: ec910f298a8bb27a845ede2e23ba59679a8e463d
+  data.tar.gz: c55131f17ee5e93c067dc3423071ed848ab1636e
 SHA512:
-  metadata.gz: 2344c171ae328a33c76181b7a8a7320894947a0eff64a864d502f70827774ff6d6ac9d1df0bee29a985557bbaa669802402d3af2f88235b0f4a3df04a1c03c49
-  data.tar.gz: a7ce210868f806945e497ba7a226f4a17995d90fa9d9ccbdd2fdd0515f5da1d3adf608a710aea6bb91fea88ed52ccb6a7e486961c55a31ef982e9810a7ba8789
+  metadata.gz: 4925a700c60e848834360ccb2d97e2874c859e1ed3ed0f45791d944cd5c752baa4c76be33f3fc9e58f4e20f9256948f8ae099baaa65f0cb474378cb0d2e67c20
+  data.tar.gz: 45bca9e35ce493f62c9a7205fb5cdb4b96f1602e5ade51e31103096026f41838113f252dff5fc564df88e3e0c78fa041159329c43da2b3f4c1d6089a815aa62a

data/changelog.md

@@ -1,3 +1,7 @@
+# Version 3.0.6
+
+* Fix deprecation warnings.
+
 # Version 3.0.5
 
 * Added an !important flag for specificity in some frameworks like IntuitCSS. [See pull 146 for details](https://github.com/modularscale/modularscale-sass/pull/146).

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 = "3.0.5"
+  VERSION = "3.0.6"
   DATE = "2018-01-23"
 end
 

data/readme.md

@@ -126,11 +126,9 @@ h2 {
 
 If you do happen to have any values that are just named without numbers they will be ignored by the responsive mixin, it’s smart enough to just pull values that look like breakpoints.
 
-Here is an [example page](http://skscratch.bitballoon.com/ms-demo) and the [corresponding Sass](https://github.com/modularscale/modularscale-sass/blob/3.x/test-compass/sass/style.scss).
-
 #### Note on non-integer values
 
-Unfortunately [Sass doesn’t natively support exponents](https://github.com/sass/sass/issues/684#issuecomment-196852515). This isn’t all bad news, you can use either use [Compass](http://compass-style.org/), [mathsass](https://github.com/terkel/mathsass), or another library that has a `pow()` function that supports non-integer values and this plugin will pick up on that function and use it. You will then be able to write values like `ms(2.5)`. This is also a prerequisite for _target sizes_ below.
+Unfortunately [Sass doesn’t natively support exponents](https://github.com/sass/sass/issues/684#issuecomment-196852515). This isn’t all bad news, you can either use [Compass](http://compass-style.org/), [mathsass](https://github.com/terkel/mathsass), or another library that has a `pow()` function that supports non-integer values and this plugin will pick up on that function and use it. You will then be able to write values like `ms(2.5)`. This is also a prerequisite for _target sizes_ below.
 
 #### Target sizes
 

data/stylesheets/modularscale/_function.scss

@@ -31,7 +31,7 @@
       $ms-base: $ms-base * $ratio;
     }
     // If the base is smaller than the main base.
-    @elseif ($ms-base < nth($base,1)) {
+    @else if ($ms-base < nth($base,1)) {
       // pump up the value until it aligns with main base.
       @while $ms-base < nth($base,1) {
         $ms-base: $ms-base * $ratio;

data/stylesheets/modularscale/_respond.scss

@@ -9,13 +9,19 @@
 }
 
 // Main responsive mixin
-@mixin ms-respond($prop, $val, $map: $modularscale) {
+@mixin ms-respond($prop, $val, $map: $modularscale, $ms-important: false) {
   $base: $ms-base;
   $ratio: $ms-ratio;
 
   $first-write: true;
   $last-break: null;
 
+  $important: '';
+
+  @if $ms-important == true {
+    $important: ' !important';
+  }
+
   // loop through all settings with a breakpoint type value
   @each $v, $s in $map {
     @if type-of($v) == number {
@@ -23,7 +29,7 @@
 
         // Write out the first value without a media query.
         @if $first-write {
-          #{$prop}: ms-function($val, $thread: $v, $settings: $map);
+          #{$prop}: unquote("#{ms-function($val, $thread: $v, $settings: $map)}#{$important}");
 
           // Not the first write anymore, reset to false to move on.
           $first-write: false;
@@ -35,7 +41,7 @@
           @media (min-width: $last-break) and (max-width: $v) {
             $val1: ms-function($val, $thread: $last-break, $settings: $map);
             $val2: ms-function($val, $thread: $v, $settings: $map);
-            #{$prop}: ms-fluid($val1,$val2,$last-break,$v);
+            #{$prop}: unquote("#{ms-fluid($val1,$val2,$last-break,$v)}#{$important}");
           }
           $last-break: $v;
         }
@@ -46,7 +52,7 @@
   // Write the last breakpoint.
   @if $last-break {
     @media (min-width: $last-break) {
-      #{$prop}: ms-function($val, $thread: $last-break, $settings: $map);
+      #{$prop}: unquote("#{ms-function($val, $thread: $last-break, $settings: $map)}#{$important}");
     }
   }
 }

data/stylesheets/modularscale/_target.scss

@@ -10,15 +10,15 @@
   @for $i from 1 through $l {
     $v: str-slice($n,$i,$i);
     @if $v == '1' { $v: 1; }
-    @elseif $v == '2' { $v: 2; }
-    @elseif $v == '3' { $v: 3; }
-    @elseif $v == '4' { $v: 4; }
-    @elseif $v == '5' { $v: 5; }
-    @elseif $v == '6' { $v: 6; }
-    @elseif $v == '7' { $v: 7; }
-    @elseif $v == '8' { $v: 8; }
-    @elseif $v == '9' { $v: 9; }
-    @elseif $v == '0' { $v: 0; }
+    @else if $v == '2' { $v: 2; }
+    @else if $v == '3' { $v: 3; }
+    @else if $v == '4' { $v: 4; }
+    @else if $v == '5' { $v: 5; }
+    @else if $v == '6' { $v: 6; }
+    @else if $v == '7' { $v: 7; }
+    @else if $v == '8' { $v: 8; }
+    @else if $v == '9' { $v: 9; }
+    @else if $v == '0' { $v: 0; }
     @else { $v: null; }
     @if $v != null {
       $m: $m - 1;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Scott Kellum
@@ -34,7 +34,6 @@ files:
 - license.md
 - readme.md
 - stylesheets/_modularscale.scss
-- stylesheets/modularscale.zip
 - stylesheets/modularscale/_function.scss
 - stylesheets/modularscale/_pow.scss
 - stylesheets/modularscale/_respond.scss
@@ -65,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Modular scale calculator built into your Sass.