middleman-oulu 0.6.27 → 0.6.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2fd30e9d1a8a04404bcee549c1921994a98ead2
-  data.tar.gz: 1ed24d1de2bf070e00a3505689fa6d888ca79a04
+  metadata.gz: 1b480da6570ec87960e7c4199214a0cefc539114
+  data.tar.gz: 27d62e82b829df3642a760d0c133e209711a145e
 SHA512:
-  metadata.gz: 1c81d7a32a8dd237c9caa7bba38c2c683bc1402907b9bb47d06ba49dd808edf559a7bacd382c0abbcd2e89e19e505311dd6bf893d852078e2ad43619511c7b9e
-  data.tar.gz: c7e60c78a36413b9566fca61ccd2173709bfb0f3764ad15a0e6531943fe0a9220927aee7a6067c63da1cf0b2116701f0cf88bb5a89c6e7fe1a028c05d6fbe2f1
+  metadata.gz: 8eed4c685c84844a8b13b8db39ec6184d05d6882530e356ef141f34a1270d2426b5af9bfe8387e151dc955490d01dbbf980c3c464d7a7d5874a1e8feaf09f028
+  data.tar.gz: 43e0c5ca94010185d947837193b3f5e2d8ca28cd85542f9ac43f81916037ec4f99df3997253cb2e95aef74e7b9589c9d8b9ed74ef866d8c5270f72cd6d31675e

data/assets/stylesheets/_oulu-base.sass

@@ -14,6 +14,7 @@
 
 // functions
 ///////////////////
+@import settings/functions/math
 @import settings/functions/list
 @import settings/functions/number
 @import settings/functions/string

data/assets/stylesheets/modules/buttons/styles/_normal.sass

@@ -3,9 +3,9 @@
   +background-image(linear-gradient(top, tint($color, 6%) 0%, shade($color, 6%) 100%))
   +border(all, solid)
   border-color: shade($color, 10%) shade($color, 16%) shade($color, 26%)
-  text-shadow: if(luma_bright($color), lighten($color, 18%) 0 1px 0, darken($color, 18%) 0 -1px 0)
   @if $text-color
     color: luma_contrast_color($color)
+    text-shadow: if(luma_bright($color), lighten($color, 18%) 0 1px 0, darken($color, 18%) 0 -1px 0)
     &:hover,
     &.hover,
     &.is-hover,

data/assets/stylesheets/settings/functions/_color.sass

@@ -22,13 +22,16 @@
   @else
     @return null
 
+// Adapted from: https://gist.github.com/voxpelli/6304812
 @function luma($color)
-  $r: red($color)
-  $g: green($color)
-  $b: blue($color)
-  @return (0.299 * $r + 0.587 * $g + 0.114 * $b)/2.55
-
-$ruma-threshold: 100 / pi() !default
+  $rgba: red($color), green($color), blue($color)
+  $rgba2: ()
+  @for $i from 1 through 3
+    $rgb: nth($rgba, $i)
+    $rgb: $rgb / 255
+    $rgb: if($rgb < .03928, $rgb / 12.92, pow(($rgb + .055) / 1.055, 2.4))
+    $rgba2: append($rgba2, $rgb)
+  @return (.2126 * nth($rgba2, 1) + .7152 * nth($rgba2, 2) + .0722 * nth($rgba2, 3))*100
 
 @function luma_contrast($color-1, $color-2: null)
   @if $color-2
@@ -61,8 +64,6 @@ $ruma-threshold: 100 / pi() !default
     @return null
 
 @function luma_contrast_color($color)
-  $luma-contrast-bright-color: #000000 !default
-  $luma-contrast-dark-color: #ffffff !default
   @if luma_which($color) == bright
     @return $luma-contrast-bright-color
   @else

data/assets/stylesheets/settings/functions/_math.sass

@@ -0,0 +1,31 @@
+// https://gist.github.com/voxpelli/6304812
+
+@function gcd($a, $b)
+  // From: http://rosettacode.org/wiki/Greatest_common_divisor#JavaScript
+  @if ($b != 0)
+    @return gcd($b, $a % $b)
+  @else
+    @return abs($a)
+
+@function pow($base, $exponent, $prec: 12)
+  // Handles decimal exponents by trying to convert them into a fraction and then use a nthRoot-algorithm for parts of the calculation
+  @if (floor($exponent) != $exponent)
+    $prec2 : pow(10, $prec)
+    $exponent: round($exponent * $prec2)
+    $denominator: gcd($exponent, $prec2)
+    @return nthRoot(pow($base, $exponent / $denominator), $prec2 / $denominator, $prec)
+  $value: $base
+  @if $exponent > 1
+    @for $i from 2 through $exponent
+      $value: $value * $base
+  @else if $exponent < 1
+    @for $i from 0 through -$exponent
+      $value: $value / $base
+  @return $value
+
+@function nthRoot($num, $n: 2, $prec: 12)
+  // From: http://rosettacode.org/wiki/Nth_root#JavaScript
+  $x: 1
+  @for $i from 0 through $prec
+    $x: 1 / $n * (($n - 1) * $x + ($num / pow($x, $n - 1)))
+  @return $x

data/assets/stylesheets/settings/variables/_default.sass

@@ -29,6 +29,7 @@ $input-selection-tx-color: black !default
 
 $bright-text-color: white !default
 $dark-text-color: black !default
+$ruma-threshold: 100 / pi() !default
 
 /////////////////
 // grids
@@ -83,3 +84,7 @@ $twitter: #55acee
 $facebook: #3b5998
 $hatena: #008FDE
 $pocket: #f23c53
+
+// luma contrast color
+$luma-contrast-bright-color: $default-text !global
+$luma-contrast-dark-color: $reversal-text !global

data/lib/middleman-oulu/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Oulu
-    VERSION = "0.6.27"
+    VERSION = "0.6.30"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-oulu
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.30
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,6 +169,7 @@ files:
 - assets/stylesheets/settings/functions/_length.sass
 - assets/stylesheets/settings/functions/_list.sass
 - assets/stylesheets/settings/functions/_map.sass
+- assets/stylesheets/settings/functions/_math.sass
 - assets/stylesheets/settings/functions/_number.sass
 - assets/stylesheets/settings/functions/_position.sass
 - assets/stylesheets/settings/functions/_reverse.sass