oulu-rails 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4dab3893ba8f559f2e6c8129974ce0c4fd51e00
-  data.tar.gz: 3518c8db61cd57fc29c9c7b1a3f6d9d3d8239135
+  metadata.gz: ad6893f94868b26061f2c2bec4a049089784af72
+  data.tar.gz: 16271c05721d7399634cc2274df2998ae28fac59
 SHA512:
-  metadata.gz: a0dc672f40c6754b38e29ba7eafd55e4c6c82cbf93963c95aa7ef822c072cb7ccde39dab74776ffd0361f43307e8dd0a80fc3eaabc9eff60a02ddfea0917fdfe
-  data.tar.gz: ea1c9f68a16a27b415223b036bdf597dce5f14358bef38390db320918d9b12d25aaeec2a1c7b7fdb6ee8bd8b0e885899af581723e66ee31a2b2406511b192553
+  metadata.gz: 0f7d82d9d4cf106db74fadf8ba9b9415cbe0400ca5d6e61e18999b9dab177c7f2c11527052bd82e146f4722ed0cebc4eb6dfe6379a801b5c481b591ada0fd736
+  data.tar.gz: dc1fa06e4c04fa6c1e0337eab91727b7a98b3e6b19ea61273261cc35903b785fdcd4aa047bb47e98f3418f324c9a47347e648c0e10ca802f20751d0f14f98b11

data/lib/oulu-rails/version.rb

@@ -1,3 +1,3 @@
 module OuluRails
-  VERSION = "0.5.14"
+  VERSION = "0.5.16"
 end

data/vendor/assets/stylesheets/_oulu-base.css.sass

@@ -68,8 +68,9 @@
 @import settings/mixins/grids
 @import settings/mixins/responsive-utilities
 @import settings/mixins/background
-@import settings/mixins/lines
-@import settings/mixins/button-base
+@import settings/mixins/line
+@import settings/mixins/button
+@import settings/mixins/image
 
 // http://sassmatic.com/
 // @import settings/mixins/sassmatic

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

@@ -40,6 +40,12 @@
   @if number($number)
     @return $number / ($number * 0 + 1)
 
+@function unit_number($value)
+  @if number($value) and not unitless($value)
+    @return true
+  @else
+    @return null
+
 @function unitless_number($value)
   @if number($value) and unitless($value)
     @return true

data/vendor/assets/stylesheets/settings/functions/_text.css.sass

@@ -4,6 +4,12 @@
   @else
     @return null
 
+@function vertical_align($value)
+  @if $value == "baseline" or $value == "top" or $value == "middle" or $value == "bottom" or $value == "text-top" or $value == "text-bottom" or $value == "super" or $value == "sub" or $value == "sub"
+    @return true
+  @else
+    @return null
+
 @function font_weight($value)
   @if $value == "bold" or $value == "normal"
     @return true
@@ -32,3 +38,9 @@
     @return true
   @else
     @return null
+
+@function white_space($value)
+  @if $value == "normal" or $value == "pre" or $value == "nowrap"
+    @return true
+  @else
+    @return null

data/vendor/assets/stylesheets/settings/mixins/_balloon-tale.css.sass

@@ -3,8 +3,8 @@
   // $tale
   $tale-direction: optional_nth($tale, 1)
   $tale-color: optional_nth($tale, 2)
-  $tale-width: optional_nth($tale, 3)
-  $tale-height: optional_nth($tale, 4)
+  $tale-width: optional_nth($tale, 3, 0)
+  $tale-height: optional_nth($tale, 4, 0)
   $parent-boder-width: optional_nth($tale, 5, 0)
   //$tale-position-manual
   $tale-position-manual-direction1: optional_nth($tale-position-manual, 1)
@@ -13,7 +13,6 @@
   $tale-position-manual-value2: optional_nth($tale-position-manual, 4)
   //$tale-border
   $tale-border-color: optional_nth($tale-border, 1)
-  $tale-border-width: optional_nth($tale-border, 2)
   &:#{if($tale-border, after, before)}
     position: absolute
     content: ""
@@ -24,14 +23,11 @@
     +border(reverse($tale-direction), $tale-color)
     @if position_vertical($tale-direction)
       // 矢印の向きが上下
+      +rem($tale-direction, $tale-height*2*-1 - if($tale-border, 0, $parent-boder-width))
       @if not $tale-position-manual or (length($tale-position-manual) == 2 and position_vertical($tale-position-manual-direction1))
         // manual が 一つだけ指定 上下方向 の場合
         left: 50%
         +rem('margin-left', $tale-width*-1)
-      @if $tale-direction == top
-        +rem($tale-direction, $tale-height*-1*2 + $parent-boder-width)
-      @else
-        +rem($tale-direction, $tale-height*-1*2 + $parent-boder-width*2)
       @if $tale-position-manual
         $tale-position-manuals: ($tale-position-manual-direction1: $tale-position-manual-value1, $tale-position-manual-direction2: $tale-position-manual-value2)
         @each $key, $value in $tale-position-manuals
@@ -46,11 +42,11 @@
             +rem($key, $value - if($tale-border, 0, $parent-boder-width))
     @if position_horizontal($tale-direction)
       // 矢印の向きが左右
+      +rem($tale-direction, $tale-width*2*-1 - if($tale-border, 0, $parent-boder-width))
       @if not $tale-position-manual or (length($tale-position-manual) == 2 and position_horizontal($tale-position-manual-direction1))
         // manual が 一つだけ指定 上下方向 の場合
         top: 50%
         +rem('margin-top', $tale-height*-1)
-      +rem($tale-direction, $tale-width*-1*2 - if($tale-border, 0, $parent-boder-width))
       @if $tale-position-manual
         $tale-position-manuals: ($tale-position-manual-direction1: $tale-position-manual-value1, $tale-position-manual-direction2: $tale-position-manual-value2)
         @each $key, $value in $tale-position-manuals
@@ -67,51 +63,50 @@
   @if $tale-border
     // tale border があるとき - 以下 tale-border の設定
     &:before
+      $tale-border-width: $tale-width + round($parent-boder-width*1.5)
+      $tale-border-height: $tale-height + round($parent-boder-width*1.5)
       position: absolute
       content: ""
       display: block
       +border(all, solid transparent)
-      +border(horizontal, $tale-width + $tale-border-width)
-      +border(vertical, $tale-height + $tale-border-width)
+      +border(horizontal, $tale-border-width)
+      +border(vertical, $tale-border-height)
       +border(reverse($tale-direction), $tale-border-color)
       @if position_vertical($tale-direction)
         // 矢印の向きが上下
+        +rem($tale-direction, $tale-border-height*2*-1)
         @if not $tale-position-manual or (length($tale-position-manual) == 2 and position_vertical($tale-position-manual-direction1))
-          // manual が 一つだけ指定 上下方向 の場合
+          // manual なし もしくは 一つだけ指定 上下方向 の場合
           left: 50%
-          +rem('margin-left', $tale-width*-1 - $tale-border-width)
-        @if $tale-direction == top
-          +rem($tale-direction, $tale-height*-1*2 - $tale-border-width*1.5)
-        @else
-          +rem($tale-direction, $tale-height*-1*2 - $tale-border-width)
+          +rem('margin-left', $tale-border-width*-1)
         @if $tale-position-manual
           $tale-position-manuals: ($tale-position-manual-direction1: $tale-position-manual-value1, $tale-position-manual-direction2: $tale-position-manual-value2)
           @each $key, $value in $tale-position-manuals
             @if position_horizontal($key)
               // manual が left or right の場合
-              +rem($key, $value - $tale-border-width)
+              +rem($key, $value - $parent-boder-width*1.5)
             @else if $tale-direction == $key
               // 矢印の向きと manual で指定する方向が同じ場合
-              +rem($key, $value - $tale-height - $tale-border-width*2)
+              +rem($key, $value - $tale-height - $parent-boder-width*3)
             @else if reverse($tale-direction) == $key
               // 上向き矢印 で manual が bottom の場合 or 下向き矢印 で manual が top の場合
               +rem($key, $value)
       @if position_horizontal($tale-direction)
         // 矢印の向きが左右
+        +rem($tale-direction, $tale-border-width*2*-1)
         @if not $tale-position-manual or (length($tale-position-manual) == 2 and position_horizontal($tale-position-manual-direction1))
-          // manual が 一つだけ指定 上下方向 の場合
+          // manual なし もしくは 一つだけ指定 左右方向 の場合
           top: 50%
-          +rem('margin-top', $tale-height*-1 - $tale-border-width)
-        +rem($tale-direction, $tale-width*-1*2 - $tale-border-width*2)
+          +rem('margin-top', $tale-border-height*-1)
         @if $tale-position-manual
           $tale-position-manuals: ($tale-position-manual-direction1: $tale-position-manual-value1, $tale-position-manual-direction2: $tale-position-manual-value2)
           @each $key, $value in $tale-position-manuals
             @if position_vertical($key)
               // manual が top or bottom の場合
-              +rem($key, $value - $tale-border-width)
+              +rem($key, $value - $parent-boder-width*1.5)
             @else if $tale-direction == $key
               // 矢印の向きと manual で指定する方向が同じ場合
-              +rem($key, $value - $tale-width - $tale-border-width*2)
+              +rem($key, $value - $tale-width - $parent-boder-width*3)
             @else if reverse($tale-direction) == $key
               // 左向き矢印 で manual が right の場合 or 右向き矢印 で manual が left の場合
               +rem($key, $value)

data/vendor/assets/stylesheets/settings/mixins/_image.css.sass

@@ -0,0 +1,3 @@
+=center-image
+  display: block
+  +margin(horizontal, auto)

data/vendor/assets/stylesheets/settings/mixins/_table.css.sass

@@ -1,14 +1,30 @@
-=table($margin-bottom: 24px, $table-scroll: null)
-  min-width: 100%
-  +rem('margin-bottom', $margin-bottom)
-  @if $table-scroll
-    min-width: 100%
-  @else
-    width: 100%
-
-=table-cell($vertical-align: middle, $padding: 8px 12px, $is-nowrap: null)
+=table-cell-assign($value)
+  $padding: if(list($value), if(unit_number(nth($value, 1)), $value, null), if(unit_number($value), $value, null))
+  white-space: if(white_space($value), $value, null)
+  background-color: if(color($value), $value, null)
+  vertical-align: if(vertical_align($value), $value, null)
   +rem('padding', $padding)
-  vertical-align: $vertical-align
+
+// +table-row($white #eeeeee, (bottom, solid 1px black))
+=table-row($value1, $value2)
+  @if $value1
+    @if list($value1)
+      &:nth-child(odd)
+        background-color: nth($value1, 1)
+      &:nth-child(even)
+        background-color: nth($value1, 2)
+    @else if color($value1)
+      background-color: nth($value1, 1)
+  @if $value2
+    +border(nth($value2, 1), nth($value2, 2))
+
+// +table-cell(middle (12px 16px) no_wrap $white, (14px 1.8 1.4em, black bold center), (bottom, solid 1px black))
+=table-cell($value1, $value2, $value3)
   +box-sizing(border-box)
-  @if $is-nowrap
-    white-space: nowrap
+  @if $value1
+    @for $i from 1 through length($value1)
+      +table-cell-assign(nth($value1, $i))
+  @if $value2
+    +text-block(nth($value2, 1), optional_nth($value2, 2, false))
+  @if $value3
+    +border(nth($value3, 1), nth($value3, 2))

data/vendor/assets/stylesheets/settings/mixins/_text.css.sass

@@ -3,6 +3,7 @@
   font-weight: if(font_weight($value), $value, null)
   text-align: if(text_align($value), $value, null)
   color: if(color($value), $value, null)
+  white-space: if(white_space($value), $value, null)
   @if px($value)
     +top($value, null)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oulu-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
@@ -362,14 +362,15 @@ files:
 - vendor/assets/stylesheets/settings/mixins/_basic-font.css.sass
 - vendor/assets/stylesheets/settings/mixins/_block.css.sass
 - vendor/assets/stylesheets/settings/mixins/_border.css.sass
-- vendor/assets/stylesheets/settings/mixins/_button-base.css.sass
+- vendor/assets/stylesheets/settings/mixins/_button.css.sass
 - vendor/assets/stylesheets/settings/mixins/_color.css.sass
 - vendor/assets/stylesheets/settings/mixins/_filters.css.sass
 - vendor/assets/stylesheets/settings/mixins/_form.css.sass
 - vendor/assets/stylesheets/settings/mixins/_grids.css.sass
 - vendor/assets/stylesheets/settings/mixins/_html5-input-types.scss
 - vendor/assets/stylesheets/settings/mixins/_ie-hacks.css.sass
-- vendor/assets/stylesheets/settings/mixins/_lines.css.sass
+- vendor/assets/stylesheets/settings/mixins/_image.css.sass
+- vendor/assets/stylesheets/settings/mixins/_line.css.sass
 - vendor/assets/stylesheets/settings/mixins/_link.css.sass
 - vendor/assets/stylesheets/settings/mixins/_list.css.sass
 - vendor/assets/stylesheets/settings/mixins/_margin-padding.css.sass