WIP: Update Modularscale to 3

.gitignore

@@ -11,7 +11,6 @@ profile
 
 #ignore packages
 node_modules
-bower_components
 *.log
 
-sassdoc
+sassdoc

Gulpfile.js

@@ -22,7 +22,6 @@ gulp.task('sass', function() {
     .pipe(customPlumber())
     .pipe(sass({
       includePaths: [
-        './bower_components/',
         './node_modules/',
         './'
       ],

css/create-class.css

@@ -6,5 +6,5 @@
   line-height: 1.5; }
 
 .h1 {
-  font-size: 6.8541rem;
+  font-size: 5.0625rem;
   line-height: 1.3; }

package.json

@@ -38,5 +38,10 @@
     "url": "https://github.com/zellwk/typi"
   },
   "author": "Zell Liew <[email protected]>",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "breakpoint-sass": "^2.7.1",
+    "mappy-breakpoints": "^0.2.3",
+    "modularscale-sass": "^3.0.5"
+  }
 }

scss/_public.scss

@@ -1,3 +1,3 @@
 @import 'public/rhythm/rhythm';
 @import 'public/typi/typi';
-@import 'public/typefaces/typefaces';
+@import 'public/typefaces/typefaces';

scss/private/calc/_calc-ms-size.scss

@@ -28,7 +28,7 @@
     $_is-ratio: _ty-is-ratio($ms-setting);
 
     @if $_is-ratio {
-      @return ms($step, 1em, $ms-setting);
+      @return ms($step, $base: 1em, $ratio: $ms-setting);
     } @else {
       @error "$typi-ms ratio at #{$breakpoint} must be unitless";
     }
@@ -61,7 +61,7 @@
       @error "$typi-ms at #{$breakpoint} must contain at least one ratio";
     }
 
-    @return ms($step, $ty-ms-base, $ty-ms-ratio);
+    @return ms($step, $base: $ty-ms-base, $ratio: $ty-ms-ratio);
   }
 }
 

test/automated/_calc-font-sizes.scss

@@ -90,14 +90,14 @@ $basemap: map-get($typi, base);
   @include test('unitless -> rem') {
     $test: _ty-ms-to-rem(2, small);
     $ratio: map-get($typi-ms, small);
-    $result: _ty-strip-unit(ms(2, 1em, $ratio)) * 1rem;
+    $result: _ty-strip-unit(ms(2, $base: 1em, $ratio: $ratio)) * 1rem;
     @include assert-equal($test, $result);
   }
 
   @include test('unitless -> em') {
     $test: _ty-ms-to-em(2, med);
     $ratio: map-get($typi-ms, med);
-    $result: ms(2, 1em, $ratio);
+    $result: ms(2, $base: 1em, $ratio: $ratio);
     @include assert-equal($test, $result);
   }
-}
+}

test/automated/_typefaces.scss

@@ -168,7 +168,7 @@ $typi-ms: (
 @include test-module('vr-ms with typefaces') {
   @include test('write one property') {
     @include assert('') {
-      @include input {
+      @include output {
         @include vr-ms(margin-top, 2, 'vr-ms-test', 'secondary');
       }
       @include expect {
@@ -187,7 +187,7 @@ $typi-ms: (
 @include test-module('Typeface output:') {
   @include test('should produce right font-size values') {
     @include assert('') {
-      @include input {
+      @include output {
         @include typi('secondary', $typeface: 'secondary');
       }
 
@@ -203,7 +203,7 @@ $typi-ms: (
   @include test('should produce right rhythm values') {
     @include assert('') {
       $font-size: nth(map-fetch($typi, secondary null), 1);
-      @include input {
+      @include output {
         margin-top: vr(3, $font-size, 'secondary');
       }
       @include expect {
@@ -213,4 +213,4 @@ $typi-ms: (
       }
     }
   }
-}
+}

test/automated/_typi-ms.scss

@@ -46,7 +46,7 @@ $typi-ms: (
     @include assert-equal($test, $result);
   }
 
-  // Hardcoded test
+  Hardcoded test
   @include test('for 2 bases') {
     $test: _ty-calc-ms(2, double-base);
     $result: ms(2, 2em 3em, 1.2);
@@ -75,7 +75,7 @@ $typi-ms: (
 @include test-module('Writing Typi MS props') {
   @include test('should output font-size and line-height') {
     @include assert('') {
-      @include input {
+      @include output {
         @include _ty-output-props((
           target: 'h1',
           target-map: map-get($typi, 'h1'),

test/automated/_write-props.scss

@@ -19,7 +19,7 @@ $basemap: map-get($typi, base);
 @include test-module('Write properties') {
   @include test('font-size only') {
     @include assert('h1 null breakpoint') {
-      @include input {
+      @include output {
         @include _ty-output-props((
             target: 'h1',
             target-map: map-get($typi, 'h1'),
@@ -44,7 +44,7 @@ $basemap: map-get($typi, base);
 
   @include test('font-size and line-height') {
     @include assert('h1 med breakpoint') {
-      @include input {
+      @include output {
         @include _ty-output-props((
             target: 'h1',
             target-map: map-get($typi, 'h1'),
@@ -64,7 +64,7 @@ $basemap: map-get($typi, base);
 
   @include test('list type for font-size in map') {
     @include assert('h1 large breakpoint') {
-      @include input {
+      @include output {
         @include _ty-output-props((
             target: 'h1',
             target-map: map-get($typi, 'h1'),
@@ -84,7 +84,7 @@ $basemap: map-get($typi, base);
 
   @include test('write base font-size') {
     @include assert('base') {
-      @include input() {
+      @include output() {
         @include _ty-output-props((
             target: 'base',
             target-map: map-get($typi, 'base'),
@@ -100,4 +100,4 @@ $basemap: map-get($typi, base);
       }
     }
   }
-}
+}

test/automated/extender.scss

@@ -1,5 +1,5 @@
 @import 'true';
-@import 'modular-scale/stylesheets/_modular-scale';
+@import 'node_modules/modularscale-sass/stylesheets/_modularscale';
 @import 'scss/typi';
 
 // Test individual extension of maps
@@ -70,4 +70,4 @@ $typi-ms: (
     );
     @include assert-equal($test2, $result2, 'for h1')
   }
-}
+}

test/automated/test.scss

@@ -1,5 +1,5 @@
 @import 'true';
-@import 'bower_components/modular-scale/stylesheets/_modular-scale';
+@import 'node_modules/modularscale-sass/stylesheets/_modularscale';
 @import 'scss/typi';
 
 @import 'breakpoints';

test/manual/baseline.scss

@@ -1,6 +1,6 @@
 @import 'scss/typi';
 @import 'mappy-breakpoints/mappy-breakpoints';
-@import 'compass-breakpoint/stylesheets/breakpoint';
+@import 'node_modules/breakpoint-sass/stylesheets/breakpoint';
 
 $breakpoints: (
   small: 400px,

test/manual/bp.scss

@@ -1,6 +1,6 @@
 @import 'scss/typi';
 @import 'mappy-breakpoints/mappy-breakpoints';
-@import 'compass-breakpoint/stylesheets/breakpoint';
+@import 'node_modules/breakpoint-sass/stylesheets/breakpoint';
 
 $breakpoints: (
   small: 400px,
@@ -37,4 +37,4 @@ $typi-breakpoint: mappy-bp;
 $typi-breakpoint: breakpoint;
 .h1 {
  @include typi(h1);
-}
+}

test/manual/create-class.scss

@@ -1,5 +1,5 @@
 @import 'scss/typi';
-@import 'modular-scale/stylesheets/_modular-scale';
+@import 'node_modules/modularscale-sass/stylesheets/_modularscale';
 
 $typi: (
   base: (

test/manual/typi-ms-vr.scss

@@ -1,4 +1,4 @@
-@import 'modular-scale/stylesheets/_modular-scale';
+@import 'node_modules/modularscale-sass/stylesheets/_modularscale';
 @import 'scss/typi';
 
 $typi: (
@@ -26,4 +26,4 @@ $typi-ms: (
 
 .testing {
   @include vr-ms(margin-top, 2, $target: 'h1');
-}
+}

test/manual/typi-ms.scss

@@ -1,4 +1,4 @@
-@import 'bower_components/modular-scale/stylesheets/_modular-scale';
+@import 'node_modules/modularscale-sass/stylesheets/_modularscale';
 @import 'scss/typi';
 
 $breakpoints: (
@@ -63,4 +63,4 @@ h2 {
 
 h2 {
   @include typi('h2', $rem: false);
-}
+}

test/test_sass.js

@@ -12,7 +12,6 @@ testFiles.forEach(basename => {
   sassTrue.runSass({
     file: testFile,
     includePaths: [
-      './bower_components',
       './node_modules'
     ]
   }, describe, it)