modular-scale 2.1.1 → 3.0.0.alpha1

data/stylesheets/modularscale/_pow.scss

@@ -0,0 +1,29 @@
+@function ms-pow($b,$e) {
+  @if function-exists('pow') {
+    @return pow($b,$e);
+  }
+
+  @if (floor($e) != $e) {
+    @error '
+======================================================================
+Non-integer values are not supported in modularscale by default.
+
+Try using mathsass in your project to add non-integer scale support.
+https://github.com/terkel/mathsass
+======================================================================
+'
+  }
+
+  $ms-return: $b;
+  @if $e > 0 {
+    @for $i from 1 to $e {
+      $ms-return: $ms-return * $b;
+    }
+  }
+  @if $e < 0 {
+    @for $i from $e through 0 {
+      $ms-return: $ms-return / $b;
+    }
+  }
+  @return $ms-return;
+}

data/stylesheets/modularscale/_respond.scss

@@ -0,0 +1,41 @@
+// Generate calc() function
+@function ms-fluid($val1: 1em, $val2: 1em, $break1: 0, $break2: 0) {
+  $diff: ms-unitless($val2) - ms-unitless($val1);
+  @return calc( #{$val1} + #{ms-unitless($val2) - ms-unitless($val1)} * ( ( 100vw - #{$break1}) / #{ms-unitless($break2) - ms-unitless($break1)} ) );
+}
+
+// Main responsive mixin
+@mixin ms-respond($prop, $val, $map: $modularscale) {
+  $base: $ms-base;
+  $ratio: $ms-ratio;
+
+  $first-write: true;
+  $last-break: null;
+
+  // loop through all settings with a breakpoint type value
+  @each $v, $s in $map {
+    @if type-of($v) == number {
+      @if unit($v) != '' {
+
+        @if $first-write {
+          #{$prop}: ms-function($val, $thread: $v, $settings: $map);
+          $first-write: false;
+          $last-break: $v;
+        }
+        @else {
+          @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);
+          }
+          $last-break: $v;
+        }
+      }
+    }
+  }
+  @if $last-break {
+    @media (min-width: $last-break) {
+      #{$prop}: ms-function($val, $thread: $last-break, $settings: $map);
+    }
+  }
+}

data/stylesheets/modularscale/_round-px.scss

@@ -0,0 +1,6 @@
+@function ms-round-px($r) {
+  @if unit($r) == 'px' {
+    @return round($r);
+  }
+  @return $r;
+}

data/stylesheets/modularscale/_settings.scss

@@ -0,0 +1,33 @@
+@function ms-settings($b: false, $r: false, $t: false, $m: $modularscale) {
+  $base: $ms-base;
+  $ratio: $ms-ratio;
+  $thread: map-get($m, $t);
+
+  // Override with user settings
+  @if map-get($m, base) {
+    $base: map-get($m, base);
+  }
+  @if map-get($m, ratio) {
+    $ratio: map-get($m, ratio);
+  }
+
+  // Override with thread settings
+  @if $thread {
+    @if map-get($thread, base) {
+      $base: map-get($thread, base);
+    }
+    @if map-get($thread, ratio) {
+      $ratio: map-get($thread, ratio);
+    }
+  }
+
+  // Override with inline settings
+  @if $b {
+    $base: $b;
+  }
+  @if $r {
+    $ratio: $r;
+  }
+
+  @return $base $ratio;
+}

data/stylesheets/modularscale/_sort.scss

@@ -0,0 +1,18 @@
+@function ms-sort($l) {
+
+  $sorted: false;
+  @while $sorted == false {
+    $sorted: true;
+    @for $i from 2 through length($l) {
+      $n1: nth($l,$i - 1);
+      $n2: nth($l,$i);
+      @if $n1 > $n2 {
+        $l: set-nth($l, $i, $n1);
+        $l: set-nth($l, $i - 1, $n2);
+        $sorted: false;
+      }
+    }
+  }
+
+  @return $l;
+}

data/stylesheets/modularscale/_strip-units.scss

@@ -0,0 +1,8 @@
+// Stripping units is not a best practice
+// This function should not be used elsewhere
+// It is used here because calc() doesn't do unit logic
+// AND target ratios use units as a hack to get a number.
+@function ms-unitless($val) {
+  $val: $val / ($val - $val + 1);
+  @return $val;
+}

data/stylesheets/modularscale/_sugar.scss

@@ -0,0 +1,3 @@
+@function ms($v: 0, $base: false, $ratio: false, $thread: false, $settings: $modularscale) {
+  @return ms-function($v, $base, $ratio, $thread, $settings);
+}

data/stylesheets/modularscale/_target.scss

@@ -0,0 +1,37 @@
+@function ms-target($t,$b) {
+
+  @if type-of($b) == 'list' {
+    @error 'Target ratios don’t work with multi-stranded modular scales.'
+  }
+
+  // target value
+  $v: ms-unitless($t);
+  // base
+  $b: ms-unitless($b);
+  // Target place on the scale the value should match
+  $t: str-slice(unit($t), 3);
+
+  // Convert strings into numbers...
+  @if $t == '0' { $t: 0; }
+  @if $t == '1' { $t: 1; }
+  @if $t == '2' { $t: 2; }
+  @if $t == '3' { $t: 3; }
+  @if $t == '4' { $t: 4; }
+  @if $t == '5' { $t: 5; }
+  @if $t == '6' { $t: 6; }
+  @if $t == '7' { $t: 7; }
+  @if $t == '8' { $t: 8; }
+  @if $t == '9' { $t: 9; }
+  @if $t == '10' { $t: 10; }
+  @if $t == '11' { $t: 11; }
+  @if $t == '12' { $t: 12; }
+  @if $t == '13' { $t: 13; }
+  @if $t == '14' { $t: 14; }
+
+  @if type-of($t) == 'string' {
+    @error 'Please select an integer between 0 and 14 for a target value in modular scale.'
+  }
+
+  // todo make this n root with n being $t
+  @return pow(($v/$b),(1/$t));
+}

data/stylesheets/modularscale/_tests.scss

@@ -0,0 +1,12 @@
+// Feature testing
+
+
+// Test if the pow() function exists
+@function ms-pow-exists() {
+  @if pow(4, 2) == 16 {
+    @return true;
+  }
+  @return false;
+}
+
+$ms-pow-exists: ms-pow-exists();

data/stylesheets/{modular-scale/_ratios.scss → modularscale/_vars.scss}

@@ -1,8 +1,6 @@
-// Golden ratio
-$phi              : 1.618034          ;
-$golden           : $phi              ;
-
+// Ratios
 $double-octave    : 4                 ;
+$pi               : 3.14159265359     ;
 $major-twelfth    : 3                 ;
 $major-eleventh   : 2.666666667       ;
 $major-tenth      : 2.5               ;
@@ -10,6 +8,8 @@ $octave           : 2                 ;
 $major-seventh    : 1.875             ;
 $minor-seventh    : 1.777777778       ;
 $major-sixth      : 1.666666667       ;
+$phi              : 1.618034          ;
+$golden           : $phi              ;
 $minor-sixth      : 1.6               ;
 $fifth            : 1.5               ;
 $augmented-fourth : 1.41421           ;
@@ -17,4 +17,9 @@ $fourth           : 1.333333333       ;
 $major-third      : 1.25              ;
 $minor-third      : 1.2               ;
 $major-second     : 1.125             ;
-$minor-second     : 1.066666667       ;
+$minor-second     : 1.066666667       ;
+
+// Base config
+$ms-base          : 1em       !default;
+$ms-ratio         : $fifth    !default;
+$modularscale     : ()        !default;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0.alpha1
 platform: ruby
 authors:
 - Scott Kellum
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
 description: |-
   A modular scale is a list of values that share the same relationship. These
   values are often used to size type and create a sense of harmony in a design. Proportions within
@@ -43,23 +43,22 @@ extra_rdoc_files:
 - license.md
 - readme.md
 files:
-- lib/modular-scale.rb
-- stylesheets/_modular-scale-tests.scss
-- stylesheets/_modular-scale.scss
-- stylesheets/modular-scale/_calc.scss
-- stylesheets/modular-scale/_function-list.scss
-- stylesheets/modular-scale/_function.scss
-- stylesheets/modular-scale/_generate-list.scss
-- stylesheets/modular-scale/_pow.scss
-- stylesheets/modular-scale/_ratios.scss
-- stylesheets/modular-scale/_respond.scss
-- stylesheets/modular-scale/_round-px.scss
-- stylesheets/modular-scale/_sort-list.scss
-- stylesheets/modular-scale/_tests.scss
-- stylesheets/modular-scale.zip
 - changelog.md
+- lib/modular-scale.rb
 - license.md
 - readme.md
+- stylesheets/_modularscale.scss
+- stylesheets/modularscale/_function.scss
+- stylesheets/modularscale/_pow.scss
+- stylesheets/modularscale/_respond.scss
+- stylesheets/modularscale/_round-px.scss
+- stylesheets/modularscale/_settings.scss
+- stylesheets/modularscale/_sort.scss
+- stylesheets/modularscale/_strip-units.scss
+- stylesheets/modularscale/_sugar.scss
+- stylesheets/modularscale/_target.scss
+- stylesheets/modularscale/_tests.scss
+- stylesheets/modularscale/_vars.scss
 homepage: http://modularscale.com
 licenses:
 - MIT
@@ -70,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Modular scale calculator built into your Sass.

data/stylesheets/_modular-scale-tests.scss

@@ -1,74 +0,0 @@
-@if "#{ms(2, 16, $minor-sixth)}" != "40.96" {
-  @debug "";
-  @warn "function ms(): FAIL!";
-  @debug "function ms(2, 16, $minor-sixth)";
-  @debug "Result:   #{ms(2, 16, $minor-sixth)}";
-  @debug "Intended: 40.96";
-  @debug "";
-}@else {
-  @warn "function ms(+): pass";
-}
-
-@if "#{ms(-2, 16, $minor-sixth)}" != "6.25" {
-  @debug "";
-  @warn "function ms(): FAIL!";
-  @debug "function ms(-2, 16, $minor-sixth)";
-  @debug "Result:   #{ms(-2, 16, $minor-sixth)}";
-  @debug "Intended: 6.25";
-  @debug "";
-}@else {
-  @warn "function ms(-): pass";
-}
-
-@if ms(2, 14 18, $major-second) != 15.75 {
-  @debug "";
-  @warn "function ms() multi-base: FAIL!";
-  @debug "function ms(2, 14 18, $major-second)";
-  @debug "Result:   #{ms(2, 14 18, $major-second)}";
-  @debug "Intended: 15.75";
-  @debug "";
-}@else {
-  @warn "function ms(+) multi-base: pass";
-}
-
-@if ms(-1, 14 18, $major-third) != 11.52 {
-  @debug "";
-  @warn "function ms() multi-base: FAIL!";
-  @debug "function ms(-1, 14 18, $major-third)";
-  @debug "Result:   #{ms(-1, 14 18, $major-third)}";
-  @debug "Intended: 11.52";
-  @debug "";
-}@else {
-  @warn "function ms(-) multi-base: pass";
-}
-
-@if "#{ms(-4, 12, $major-tenth $octave)}" != "1.92" {
-  @debug "";
-  @warn "function ms() multi-ratio: FAIL!";
-  @debug "function ms(-4, 12, $major-tenth $octave)";
-  @debug "Result:   #{ms(-4, 12, $major-tenth $octave)}";
-  @debug "Intended: 1.92";
-  @debug "";
-}@else {
-  @warn "function ms(+) multi-ratio: pass";
-}
-
-@if ms(-4, 12, $major-tenth $octave) != 1.92 {
-  @debug "";
-  @warn "function ms() multi-ratio: FAIL!";
-  @debug "function ms(-4, 12, $major-tenth $octave)";
-  @debug "Result:   #{ms(-4, 12, $major-tenth $octave)}";
-  @debug "Intended: 1.92";
-  @debug "";
-}@else {
-  @warn "function ms(-) multi-ratio: pass";
-}
-
-@if ms-list(-3, 3, 10 16, $major-third) != (6.5536 8 8.192 10 10.24 12.5 12.8) {
-  @debug "function ms-list(): FAIL!";
-  @warn "function ms-list(-3, 3, 10 16, $major-third)";
-  @debug "Result:   (#{ms-list(-3, 3, 10 16, $major-third)})";
-  @debug "Intended: (6.5536 8 8.192 10 10.24 12.5 12.8)";
-}@else {
-  @warn "function ms-list(): pass";
-}

data/stylesheets/_modular-scale.scss

@@ -1,18 +0,0 @@
-@import "modular-scale/ratios";
-
-$ms-base:  1em      !default;
-$ms-ratio: $golden  !default;
-$ms-range: null     !default;
-$ms-fluid: true     !default;
-
-@import "modular-scale/tests";
-
-@import "modular-scale/pow";
-@import "modular-scale/calc";
-@import "modular-scale/generate-list";
-@import "modular-scale/sort-list";
-@import "modular-scale/round-px";
-@import "modular-scale/function";
-@import "modular-scale/function-list";
-
-@import "modular-scale/respond";

data/stylesheets/modular-scale/_calc.scss

@@ -1,17 +0,0 @@
-@function ms-calc($Value, $Base: $ms-base, $Ratio: $ms-ratio) {
-  
-  // If pow exists use it.
-  // It supports non-interger values!
-  @if $MS-pow-exists {
-
-    // The formula for figuring out modular scales is:
-    // (r^v)*b
-    @return pow($Ratio, $Value) * $Base;
-  }
-
-  // If not, use ms-pow().
-  // Not as fast or capable of non-integer exponents.
-  @else {
-    @return ms-pow($Ratio, $Value) * $Base;
-  }
-}