middleman-oulu 0.6.18 → 0.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92c641777c7125e300957734adf19b0226421569
-  data.tar.gz: 70c9b1f81a72482471c1e78c1ba13b4fa968470b
+  metadata.gz: ed25ae0f0335fde240087144de641734df71e0ac
+  data.tar.gz: aac1ab5b1bd25432c32b5031b90b221f6c486cf4
 SHA512:
-  metadata.gz: 38914233b5de4524de9cee0d13f27c5405f1927863cf38ef13945330bb856a3f5a79801962fb13ebe4b17009d423ac4d9f0666593618708f7730bcc596f9f959
-  data.tar.gz: 0add6237070d0ec425bf58a05359024fe17cb73aadd0dfb61e4b4c47a0867ac2e6ef1915c7b11fe4120e9f0c0a71c2abe2a9164cd22e52eb718d74799e23c30a
+  metadata.gz: 5b44c4fa9d0129d97b1455eb751f6ce324b5d660a18a6cc4af7b26f832d74242d99f04ee6d2e76a6606be90a40fbbf28b1518b439a8b6c4f924fe7ae7aa53116
+  data.tar.gz: a001113d36987d3015c19255da106108c0f2601b72912f9094f4686eb8ac213f4e89b10b480148658e7c1ff076d8fe5fa0443432c6269e11a1b6ef5466dea669

data/assets/stylesheets/modules/buttons/_buttons.sass

@@ -1,6 +1,6 @@
-$button-sizes: xs, sm, md, lg, xl
-$button-color-names: default, primary, success, warning, danger
-$button-styles: normal, border, flat-emboss, material
+$button-sizes: xs, sm, md, lg, xl !default
+$button-color-names: default, primary, success, warning, danger !default
+$button-styles: normal, border, flat-emboss, material !default
 
 @import button-base
 

data/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/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/lib/middleman-oulu/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Oulu
-    VERSION = "0.6.18"
+    VERSION = "0.6.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-oulu
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.20
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler