MyMatrix

README.md

@@ -1,4 +1,6 @@
-Gumby Framework [![Build Status](https://travis-ci.org/GumbyFramework/Gumby.png?branch=master)](https://travis-ci.org/GumbyFramework/Gumby)
+**Unfortunately Digital Surgeons has decided to retire Gumby Framework in order to focus our efforts on making other awesome things for the web. Please feel free to continue to use the framework, however development has ceased. If you are interested in inheriting the project please [get in touch](http://www.digitalsurgeons.com/contact/)!**
+
+Gumby Framework [![Build Status](https://travis-ci.org/GumbyFramework/Gumby.svg?branch=master)](https://travis-ci.org/GumbyFramework/Gumby)
 =====================
 
 Gumby Framework is a flexible, responsive CSS Framework, Powered by SASS. Create rapid and logical page layout and app

bower.json

@@ -1,5 +1,5 @@
 {
   "name": "gumby",
   "version": "2.6.3",
-  "main": ["./js/libs/gumby.min.js", "./css/gumby.css"]
+  "main": ["./js/libs/gumby.min.js", "./css/gumby.css", "./sass/gumby.scss"]
 }

config.rb

@@ -3,12 +3,10 @@
 # Tell compass where to find local extensions
 # If you followed directions and ran 'gem install modular-scale' comment the next two lines out:
 extensions_dir = "sass/extensions"
-
 Compass::Frameworks.register('modular-scale', :path => File.expand_path("#{extensions_dir}/modular-scale"))
 
-# Uncomment these to use regular Ruby gems.
+# Uncomment the line below to use out regular Ruby gems.
 # require 'modular-scale'
-# require 'sassy-math'
 
 # Set this to the root of your project when deployed:
 http_path = "/"

sass/_grid.scss

@@ -1,8 +1,3 @@
-%zero-margin-left {
-  margin-left: 0;
-}
-
-
 /*=================================================
 
 	+++ LE GRID +++

sass/_typography.scss

@@ -10,6 +10,9 @@ h1,h2,h3,h4,h5,h6 {
   @include padding-trailer($rhythm-spacing);
   a {
     color: $header-link-color;
+    &:hover {
+      color: $header-link-hover-color;
+    }
   }
 }
 
@@ -51,9 +54,9 @@ h6 { @include font-size($norm);}
 }
 
 /*=====================================================
- 
+
   Links & Paragraph styles
-  
+
   ======================================================*/
 
 p {
@@ -85,7 +88,7 @@ a {
 /*=====================================================
 
   Lists
-  
+
  ======================================================*/
 
 ul, ol {
@@ -102,7 +105,7 @@ ol {
 }
 
 ul {
-  &.square, &.circle, &.disc {
+  &.square, &.circle, &.disc, &.blank {
     margin-left: 25px;
   }
   &.square {
@@ -137,7 +140,7 @@ dl dt {
 }
 
 @include respond(portrait-tablets) {
-  
+
   ul, ol, dl, p { text-align: left;}
 
 }

sass/extensions/modular-scale/lib/modular-scale.rb

@@ -1,128 +1,128 @@
+# All gems that are required for this extension to work should go here.
+# These are the requires you would normally put in your config.rb file
+# By default, you should always included Compass. Do not include your
+#  extension.
 require 'compass'
-# require 'sassy-math'
 
 # This tells Compass what your Compass extension is called, and where to find
 #  its files
-# Replace 'extension' with the name of your extension. Spaces allowed.
 extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 Compass::Frameworks.register('modular-scale', :path => extension_path)
 
 # Version and date of version for your Compass extension.
-# Replace Extension with the name of your extension
+# Replace ModularScale with the name of your extension
 #  Letters, numbers, and underscores only
 #  Version is a number. If a version contains alphas, it will be created as
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module ModularScale
-  VERSION = "1.0.6"
-  DATE = "2012-08-13"
+  VERSION = "2.0.6"
+  DATE = "2013-12-20"
 end
 
-# This is where any custom SassScript should be placed. The functions will be  
+# This is where any custom SassScript should be placed. The functions will be
 #  available on require of your extension without the need for users to import
 #  any partials. Uncomment below.
 
-# Modular Scale Sass Script
-module Sass::Script
-  class Number < Literal
-    # Comparison
-    def <=>(other)
-      value <=> other.value
-    end
-  end
-end
-
 module Sass::Script::Functions
-  # Modular Scale
-  def double_octave
-    value = 4 / 1.0
-    Sass::Script::Number.new(value)
-  end
-  def major_twelfth
-    value = 3 / 1.0
-    Sass::Script::Number.new(value)
-  end
-  def major_eleventh
-    value = 8 / 3.0
-    Sass::Script::Number.new(value)
-  end
-  def major_tenth
-    value = 5 / 2.0
-    Sass::Script::Number.new(value)
-  end
-  def octave
-    value = 2 / 1.0
-    Sass::Script::Number.new(value)
-  end
-  def major_seventh
-    value = 15 / 8.0
-    Sass::Script::Number.new(value)
-  end
-  def minor_seventh
-    value = 16 /9.0
-    Sass::Script::Number.new(value)
-  end
-  def major_sixth
-    value = 5 / 3.0
-    Sass::Script::Number.new(value)
-  end
-  def minor_sixth
-    value = 8 / 5.0
-    Sass::Script::Number.new(value)
-  end
-  def fifth
-    value = 3 / 2.0
-    Sass::Script::Number.new(value)
-  end
-  def augmented_fourth
-    value = Math.sqrt(2) / 1.0
-    Sass::Script::Number.new(value)
-  end
-  def fourth
-    value = 4 / 3.0
-    Sass::Script::Number.new(value)
-  end
-  def major_third
-    value = 5 / 4.0
-    Sass::Script::Number.new(value)
-  end
-  def minor_third
-    value = 6 / 5.0
-    Sass::Script::Number.new(value)
-  end
-  def major_second
-    value = 9 / 8.0
-    Sass::Script::Number.new(value)
-  end
-  def minor_second
-    value = 16 / 15.0
-    Sass::Script::Number.new(value)
-  end
 
-  # Lists
-  def sort_list(list)
-    sep = list.separator if list.is_a?(Sass::Script::List)
-    list = list.to_a.sort
-    Sass::Script::List.new(list, sep)
-  end
-  def reverse_list(list)
-    sep = list.separator if list.is_a?(Sass::Script::List)
-    list = list.to_a.reverse
-    Sass::Script::List.new(list, sep)
+  # Let MS know that extra functionality is avalible
+  def ms_gem_installed()
+    Sass::Script::Bool.new(true)
   end
-  def trim_list(list, threshold, ascending)
-    # remove list items above or below a threshold
-    sep = list.separator if list.is_a?(Sass::Script::List)
-    list = list.to_a
-    if ascending.value
-      list = list.delete_if {
-        |x| x.value <= threshold.value
-      }
+
+  def ms_gem_func(value, bases, ratios)
+
+    # Convert to native ruby things
+    rvalue  = value.value.to_i
+
+    if bases.class == Sass::Script::Number
+      bases  = [] << bases
+    else
+      bases  = bases.value.to_a
+    end
+    if ratios.class == Sass::Script::Number
+      ratios = [] << ratios
     else
-      list = list.delete_if {
-        |x| x.value >= threshold.value
-      }
+      ratios = ratios.value.to_a
+    end
+
+    # Convert items in arrays to floating point numbers
+    rbases  = []
+    rratios = []
+    bases.each do |num|
+      rbases << num.value.to_f
+    end
+    ratios.each do |num|
+      rratios << num.value.to_f
     end
-    Sass::Script::List.new(list, sep)
+
+
+    # Blank array for return
+    r = [rbases[0]]
+
+    # loop through all possibilities
+    # NOTE THIS IS NOT FULLY FUNCTIONAL YET
+    # ONLY LOOPS THROUGH SOME/MOST OF THE POSSIBILITES
+
+    rratios.each do |ratio|
+      rbases.each do |base|
+
+        base_counter = 0
+
+        # Seed list with an initial value
+        r << base
+
+        # Find values on a positive scale
+        if rvalue >= 0
+          # Find higher values on the scale
+          i = 0;
+          while ((ratio ** i) * base) >= (rbases[0])
+            r << (ratio ** i) * base
+            i = i - 1;
+          end
+
+          # Find lower possible values on the scale
+          i = 0;
+          while ((ratio ** i) * base) <= ((ratio ** (rvalue + 1)) * base)
+            r << (ratio ** i) * base
+            i = i + 1;
+          end
+
+        else
+
+          # Find lower values on the scale
+          i = 0;
+          while ((ratio ** i) * base) <= (rbases[0])
+            r << (ratio ** i) * base
+            i = i + 1;
+          end
+
+          # Find higher possible values on the scale
+          i = 0;
+          while ((ratio ** i) * base) >= ((ratio ** (rvalue - 1)) * base)
+            r << (ratio ** i) * base
+            i = i - 1;
+          end
+        end
+
+      end
+    end
+
+    # Sort and trim
+    r.sort!
+    r.uniq!
+
+
+    if rvalue < 0
+      r = r.keep_if { |a| a <= rbases[0] }
+      # Final value
+      r = r[(rvalue - 1)]
+    else
+      r = r[rvalue]
+    end
+
+
+    Sass::Script::Number.new(r)
   end
-end
+end

sass/extensions/modular-scale/stylesheets/_modular-scale-tests.scss

@@ -0,0 +1,74 @@
+@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";
+}