middleman-oulu 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0d8b2f29947eec860b2ff8b47e25c87d524c0b
-  data.tar.gz: 0ef88be79fcdbacbacff3c059b71d06d40b71c01
+  metadata.gz: 51b2a57a3b098e1d3e5d110d1bb9852bca678966
+  data.tar.gz: 64a059b13ceda8f284c7716f29522e387325e055
 SHA512:
-  metadata.gz: 61f015dbb045f7354dae1d9ad53a0c7da49f502b068dba8d31372e6040881c6ea94bba85aa77df79150e893f977ec78d1d869c15699be140ea5c627463f75b70
-  data.tar.gz: c1128e7e6bef1cbe9a5c7da177a8bf3bb9c346f7e836e81b2062e7e91f0810ee7bca7ec686f75f32ddfb70d28c6cf2eb5ea4ab5aec5c673d5a350582f0ea9d35
+  metadata.gz: e22b7ca62ce39b495cc460b9dbd5149f3c67b02666a3b883d5b658c4ddab2b0fa925db2e51653e0863275bd958a6b0f96161ac6cc7ddf758d42871a180c5ebd5
+  data.tar.gz: d360be28cac3111a95beb7c077c410ab685804b040d04c12639d588b861bdf729e9a6d8e5f35c672e01853d287312daa2ab13691d83c1c405fb6f8cd9ac2b938

data/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/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/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/assets/stylesheets/settings/mixins/_balloon-tale.css.sass

@@ -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, 0)
   &:#{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/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/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)
 

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

@@ -18,9 +18,8 @@ $rgbapng_px_size: 8 !default
 // layout
 ////////////////
 
-$wrapper-class-name: wrapper !default
-$wrapper-max-width: 1100px !default
-$wrapper-horizontal-padding: 16px !default
+$wrapper-max-width: 768px
+$wrapper-horizontal-padding: 16px
 
 /////////////////
 // selection

data/lib/middleman-oulu/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Oulu
-    VERSION = "0.5.15"
+    VERSION = "0.5.16"
   end
 end

metadata

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

data/assets/stylesheets/settings/mixins/_button-base.css.sass

@@ -1,27 +0,0 @@
-=button-base($font-size: 12px, $height: 30px, $font-weight: bold, $width: auto, $is-block: null, $is-center: null, $icon-font-size: 14px, $icon-position: null)
-  +rem('font-size', $font-size)
-  +rem('height', $height)
-  +rem('line-height', $height)
-  font-weight: $font-weight
-  +rem('width', $width)
-  text-decoration: none
-  +relative(1)
-  text-align: center
-  @if $is-block == "true"
-    display: block
-  @else
-    +inline-block
-  @if $is-center == "true"
-    +margin(horizontal, auto)
-  @if $icon-font-size
-    i
-      +text-block($icon-font-size, $height)
-      +rem('width', $height)
-      display: block
-      text-align: center
-    @if $icon-position == "left"
-      i
-        +absolute(left, 0, top, 0)
-    @else if $icon-position == "right"
-      i
-        +absolute(right, 0, top, 0)

data/assets/stylesheets/settings/mixins/_lines.css.sass

@@ -1,18 +0,0 @@
-=dotted-line($color: rgba(#000, 1.0), $stripe: null)
-  $stripe-width: if(length($stripe) >= 1, nth($stripe, 1), 1px)
-  $gatter-width: if(length($stripe) >= 2, nth($stripe, 2), 4px)
-  $size: if(length($stripe) >= 3, nth($stripe, 3), 1px)
-  +background-image(linear-gradient(left, color-stops($color, $color (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%)))
-  +background-size(($stripe-width + $gatter-width) ($stripe-width + $gatter-width))
-  +rem('height', $size)
-
-// http://codepen.io/anon/pen/tGhLp を改造
-=striped-line($stripe-color: #000000, $size: 20px)
-  @if length($stripe-color) == 1
-    +background-image(linear-gradient(-45deg, $stripe-color 25%, transparent 25%, transparent 50%, $stripe-color 50%, $stripe-color 75%, transparent 75%, transparent))
-  @else
-    $mix-stripe-color: darken(nth($stripe-color, 1), nth($stripe-color, 2))
-    +background-image(linear-gradient(-45deg, $mix-stripe-color 25%, transparent 25%, transparent 50%, $mix-stripe-color 50%, $mix-stripe-color 75%, transparent 75%, transparent))
-    background-color: $background-color
-  +background-size($size $size)
-  +rem('height', $size)