oulu-rails 0.6.16 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79d3bd408946164dc4412609835f563240345ca
-  data.tar.gz: c2bbb067cad1d49e8c61481b759d4bd12b3299e9
+  metadata.gz: 8f07c0aa8b00d484ff2e0f3589548d8e1242c0b8
+  data.tar.gz: e0f3de811b6b89f46b4c374b560abdbad34c69df
 SHA512:
-  metadata.gz: c134a98f590e27fe903100c04fc1b0773429dfd8b77a441bea3660347aa0aebd6f6a559bc23ad310262624117d6d5528071f5590d0cf52ccd422f45e2a9c698e
-  data.tar.gz: 917545ef600c73806a2a52c21d0d760f268a048967d0a07c26b3a23513852b5a3da4fef5f5d34e40aba501190b7300420b3bad2cfcd4c96dd61e12be05cbbbdb
+  metadata.gz: 18be6ec144e4909cd4bf4ec10c0d14bedec0c98bfae818da0791e13e4f1ab6fbf1ce50fd06c9b700536e0a84daaed9bcaa13400c594dd5123ca19471fc963d2e
+  data.tar.gz: ee08101ae51b9a3f88b6f190416acfca29602a2f76742505d1e4aaefdba5666913f705b58fa7d28398c8c00531fe6457dd59ab4dc32cf35db44143f4fd6c0307

data/lib/oulu-rails/version.rb

@@ -1,3 +1,3 @@
 module OuluRails
-  VERSION = "0.6.16"
+  VERSION = "0.6.19"
 end

data/vendor/assets/stylesheets/settings/functions/_number.sass

@@ -85,3 +85,11 @@
     @return (strip_unit($em) * strip_unit($base-px)) * 1px
   @else if px($em)
     @return $em
+
+@function multiple($number, $multiple_number)
+  // $multiple_number で割り切れる $number に近い数を出す
+  $remainder: $number % $multiple_number
+  @if $remainder == 0
+    @return "#{$number - $remainder}"
+  @else
+    @return "#{$number - $remainder} and #{$number + $remainder}"

data/vendor/assets/stylesheets/settings/mixins/_balloon-tail.sass

@@ -18,9 +18,6 @@
     @else if position_horizontal($tail-direction) and position_vertical($key)
       // 矢印の向きが左右で manual が top or bottom の場合
       +rem($key, $value + if($tail-border-color, $parent-boder-width, 0))
-    @else if $tail-direction == $key
-      // 矢印の向きと manual で指定する方向が同じ場合
-      +rem($key, $value - $tail-height*2 - if($tail-border-color, 0, $parent-boder-width))
     @else if reverse($tail-direction) == $key
       // 上向き矢印 で manual が bottom の場合 or 下向き矢印 で manual が top の場合
       +rem($key, $value - if($tail-border-color, 0, $parent-boder-width))
@@ -33,9 +30,6 @@
     @else if position_horizontal($tail-direction) and position_vertical($key)
       // 矢印の向きが左右で manual が top or bottom の場合
       +rem($key, $value)
-    @else if $tail-direction == $key
-      // 矢印の向きと manual で指定する方向が同じ場合
-      +rem($key, $value - $tail-height*2)
     @else if reverse($tail-direction) == $key
       // 上向き矢印 で manual が bottom の場合 or 下向き矢印 で manual が top の場合
       +rem($key, $value)
@@ -62,9 +56,9 @@
       +border(horizontal, $tail-width/2)
       +rem($tail-direction, $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width))
       @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_vertical($tail-position-manual-direction1))
-        // manual が 一つだけ指定 上下方向 の場合
+        // manual なし、または 一つだけ指定 上下方向 の場合
         left: 50%
-        +rem('margin-left', $tail-width*-1)
+        +rem('margin-left', $tail-width/2*-1)
       @if $tail-position-manual
         +tail-position-manual($tail-direction, $tail-border-color, $parent-boder-width, $tail-position-manuals)
     @if position_horizontal($tail-direction)
@@ -73,7 +67,7 @@
       +border(vertical, $tail-width/2)
       +rem($tail-direction, $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width))
       @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_horizontal($tail-position-manual-direction1))
-        // manual が 一つだけ指定 上下方向 の場合
+        // manual なし、または 一つだけ指定 上下方向 の場合
         top: 50%
         +rem('margin-top', ($tail-width/2)*-1)
       @if $tail-position-manual
@@ -83,7 +77,7 @@
     // tail border があるとき - 以下 tail-border の設定
     &:before
       $tail-width: round($tail-width + $parent-boder-width*2)/2
-      $tail-height: round($tail-height + $parent-boder-width*4)
+      $tail-height: round($tail-height + $parent-boder-width*2)
       $tail-color: $tail-border-color
       +balloon-tail-setting($tail-direction, $tail-color)
       @if position_vertical($tail-direction)
@@ -92,7 +86,7 @@
         @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_vertical($tail-position-manual-direction1))
           // manual なし もしくは 一つだけ指定 上下方向 の場合
           left: 50%
-          +rem('margin-left', round($tail-width*-1.5))
+          +rem('margin-left', round($tail-width*-1))
         @if $tail-position-manual
           +tail-border-position-manual($tail-direction, $tail-position-manuals)
       @if position_horizontal($tail-direction)

data/vendor/assets/stylesheets/settings/mixins/_block.sass

@@ -37,14 +37,14 @@
   @else
     +rem('line-height', $square-block-size)
 
-=over-flow($values)
-  $over-flow-x: optional_nth($values, 1)
-  $over-flow-y: optional_nth($values, 2)
+=overflow($values)
+  $overflow-x: optional_nth($values, 1)
+  $overflow-y: optional_nth($values, 2)
   @if equal_nth($values, 2)
-    over-flow-x: $over-flow-x
-    over-flow-y: $over-flow-y
+    overflow-x: $overflow-x
+    overflow-y: $overflow-y
   @else
-    over-flow: $over-flow-x
+    overflow: $overflow-x
 
 =inline-block($value: null)
   display: inline-block

data/vendor/assets/stylesheets/settings/mixins/_link.sass

@@ -17,7 +17,7 @@
   display: block
   text-decoration: none
 
-=inline-block-link($value: false)
+=inline-block-link($value: null)
   display: inline-block
   text-decoration: none
   vertical-align: $value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oulu-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.19
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails