middleman-oulu 0.5.16 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b2a57a3b098e1d3e5d110d1bb9852bca678966
-  data.tar.gz: 64a059b13ceda8f284c7716f29522e387325e055
+  metadata.gz: 0febf6f63d78eda0ea198c00c720b743531c6441
+  data.tar.gz: 839021750db54a9812c28e92c3615a2a6460d52c
 SHA512:
-  metadata.gz: e22b7ca62ce39b495cc460b9dbd5149f3c67b02666a3b883d5b658c4ddab2b0fa925db2e51653e0863275bd958a6b0f96161ac6cc7ddf758d42871a180c5ebd5
-  data.tar.gz: d360be28cac3111a95beb7c077c410ab685804b040d04c12639d588b861bdf729e9a6d8e5f35c672e01853d287312daa2ab13691d83c1c405fb6f8cd9ac2b938
+  metadata.gz: 0adda5b1eed07664764b86a16e82a0d4eedc8d3a3b5e80434c7350936c15165412233fa286e7d679594a8b23fb83590f965698f3119d33690a72271d3f28ee0d
+  data.tar.gz: 33bd389730c8c43f939b9f016798f76550a62461e774e426b46d61819cefe1109f657cdc83b8e0e3df6847b8ddca44aaff9053061546aa4c7b76f0577d488379

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

@@ -45,6 +45,7 @@
 @import settings/functions/image
 @import settings/functions/background
 @import settings/functions/border
+@import settings/functions/animation
 
 // mixins
 ///////////////////
@@ -62,7 +63,6 @@
 @import settings/mixins/color
 @import settings/mixins/overlay
 @import settings/mixins/balloon-tale
-@import settings/mixins/sprite-background
 @import settings/mixins/margin-padding
 @import settings/mixins/animation
 @import settings/mixins/grids
@@ -71,6 +71,7 @@
 @import settings/mixins/line
 @import settings/mixins/button
 @import settings/mixins/image
+@import settings/mixins/reset
 
 // http://sassmatic.com/
 // @import settings/mixins/sassmatic

data/assets/stylesheets/_oulu.css.sass

@@ -11,3 +11,4 @@
 @import helper/typoglaphy
 @import helper/click-actions
 @import helper/fade-actions
+@import helper/no-gutter-grids

data/assets/stylesheets/helper/_no-gutter-grids.css.sass

@@ -0,0 +1,3 @@
+body
+  .no-gutter-grids
+    +grid-columns(0)

data/assets/stylesheets/settings/functions/_animation.css.sass

@@ -0,0 +1,90 @@
+@function time($value)
+  @if unit_number($value) and unit($value) == 's'
+    @return true
+  @else
+    @return null
+
+@function timing_function($value)
+  @if string($value)
+    @if $value == 'ease' or $value == 'linear' or $value == 'ease-in' or $value == 'ease-out' or $value == 'ease-in-out' or str-slice($value, 1, 12) == 'cubic-bezier'
+      @return true
+    @else
+      @return null
+  @else
+    @return null
+
+@function delay($value)
+  @if string($value) and str-slice($value, 1, 1) == '/' and str-slice($value, -1, -1) == 's'
+    @return str-slice($value, 2)
+  @else
+    @return null
+
+//////////////////
+// transition
+//////////////////
+
+@function transition_duration($value)
+  @return time($value)
+
+@function transition_timing_function($value)
+  @return timing_function($value)
+
+@function transition_delay($value)
+  @return delay($value)
+
+@function transition-property($value)
+  @if string($value)
+    @if not transition_timing_function($value) or not transition_duration($value) or not transition_delay($value)
+      @return true
+    @else
+      @return null
+  @else if list($value)
+    @return true
+  @else
+    @return null
+
+//////////////////
+// animation
+//////////////////
+
+@function animation_duration($value)
+  @return time($value)
+
+@function animation_timing_function($value)
+  @return timing_function($value)
+
+@function animation_delay($value)
+  @return delay($value)
+
+@function animation_iteration_count($value)
+  @if unitless_number($value) or (string($value) and $value == 'infinite')
+    @return true
+  @else
+    @return null
+
+@function animation_direction($value)
+  @if string($value) and ($value == 'normal' or $value == 'alternate')
+    @return true
+  @else
+    @return null
+
+@function animation_fill_mode($value)
+  @if string($value) and ($value == 'nonel' or $value == 'forwards' or $value == 'backwards' or $value == 'both')
+    @return true
+  @else
+    @return null
+
+@function animation_play_state($value)
+  @if string($value) and ($value == 'running' or $value == 'paused')
+    @return true
+  @else
+    @return null
+
+@function animation_name($value)
+  @if string($value)
+    @if animation_timing_function($value) or animation_duration($value) or animation_delay($value) or animation_iteration_count($value) or animation_direction($value) or animation_fill_mode($value) or animation_play_state($value)
+      @return null
+    @else
+      @return true
+  @else
+    @return null

data/assets/stylesheets/settings/functions/_background.css.sass

@@ -23,7 +23,7 @@
     @if $value == 'auto' or $value == 'contain' or $value == 'cover'
       @return true
     @else if str-slice($value, 2) == 'auto' or $value == 'contain' or $value == 'cover'
-      @return true
+      @return $value
     @else
       @return null
   @else if list($value)

data/assets/stylesheets/settings/functions/_length.css.sass

@@ -1,14 +1,14 @@
 // $nのときにtrue
 @function equal_nth($value, $n)
   @if length($value) == $n
-    @return ture
+    @return true
   @else
     @return null
 
 // $n以上のときにtrue
 @function or_more_nth($value, $n)
   @if length($value) >= $n
-    @return ture
+    @return true
   @else
     @return null
 

data/assets/stylesheets/settings/functions/_string.css.sass

@@ -1,5 +1,5 @@
 @function string($value)
-  @if type-of($value) == string
+  @if type_of($value) == string
     @return true
   @else
     @return null

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

@@ -1,15 +1,45 @@
-// https://gist.github.com/ericam/1607696
-=keyframes($name)
-  @-webkit-keyframes #{$name}
-    @content
-  @-moz-keyframes #{$name}
-    @content
-  @-ms-keyframes #{$name}
-    @content
-  @keyframes #{$name}
-    @content
+=transition($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null, $value7: null, $value8: null, $value9: null, $value10: null)
+  $list: $value1 $value2 $value3 $value4 $value5 $value6 $value7 $value8 $value9 $value10
+  $transition-properties: ()
+  $transition-durations: ()
+  $transition-timing-functions: ()
+  $transition-delays: ()
+  @each $value in $list
+    @for $i from 1 through length($value)
+      $transition-properties: append(transition-properties, if(transition_property(nth($value, $i)), nth($value, $i), null), comma)
+      $transition-durations: append($transition-durations, if(transition_duration(nth($value, $i)), nth($value, $i), null), comma)
+      $transition-timing-functions: append($transition-timing-functions, if(transition_timing_function(nth($value, $i)), nth($value, $i), null), comma)
+      $transition-delays: append($transition-delays, if(transition_delay(nth($value, $i)), transition_delay(nth($value, $i)), null), comma)
+  +transition-property($transition-properties)
+  +transition_duration($transition-durations)
+  +transition_timing_function($transition-timing-functions)
+  +transition-delay($transition-delays)
 
-=transition($transition-duration: .5s, $transition-property: all, $transition-timing: ease-in)
-  +transition-property($transition-property)
-  +transition-duration($transition-duration)
-  +transition-timing-function($transition-timing)
+=animations($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null, $value7: null, $value8: null, $value9: null, $value10: null)
+  $list: $value1 $value2 $value3 $value4 $value5 $value6 $value7 $value8 $value9 $value10
+  $animation-names: ()
+  $animation-durations: ()
+  $animation-timing-functions: ()
+  $animation-delays: ()
+  $animation-iteration-counts: ()
+  $animation-directions: ()
+  $animation-fill-modes: ()
+  $animation-play-states: ()
+  @each $value in $list
+    @for $i from 1 through length($value)
+      $animation-names: append($animation-names, if(animation_name(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-durations: append($animation-durations, if(animation_duration(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-timing-functions: append($animation-timing-functions, if(animation_timing_function(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-delays: append($animation-delays, if(animation_delay(nth($value, $i)), animation_delay(nth($value, $i)), null), comma)
+      $animation-iteration-counts: append($animation-iteration-counts, if(animation_iteration_count(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-directions: append($animation-directions, if(animation_direction(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-fill-modes: append($animation-fill-modes, if(animation_fill_mode(nth($value, $i)), nth($value, $i), null), comma)
+      $animation-play-states: append($animation-play-states, if(animation_play_state(nth($value, $i)), nth($value, $i), null), comma)
+  +animation-name($animation-names)
+  +animation_duration($animation-durations)
+  +animation_timing_function($animation-timing-functions)
+  +animation-delay($animation-delays)
+  +animation-iteration-count($animation-iteration-counts)
+  +animation-direction($animation-directions)
+  +animation-fill-mode($animation-fill-modes)
+  +animation-play-state($animation-play-states)

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

@@ -1,3 +1,23 @@
+// http://qiita.com/orangemittoo/items/1c9f32296836d3ea125e
+
+$sprites-images-directory: sprites !default
+$sprite-map: sprite-map("#{$sprites-images-directory}/*.png", $layout: smart)
+$map-img: sprite-url($sprite-map)
+
+=sprite-background($name, $background-size: null, $background-repeat: null)
+  // block;
+  background-image: $map-img
+  $pos: sprite-position($sprite-map, $name)
+  background-position: nth($pos, 1) / 2 nth($pos, 2) / 2
+  @if $background-size
+    +background-size($background-size)
+  @else
+    +background-size(ceil(image-width(sprite-path($sprite-map)) / 2) auto)
+  @if $background-repeat
+    background-repeat: $background-repeat
+  @else
+    background-repeat: no-repeat
+
 =bg-size($value)
   @if list($value)
     @if str-slice(nth($value, 1), 1, 1) == '/'

data/assets/stylesheets/settings/mixins/_basic-font.css.sass

@@ -16,7 +16,6 @@
   font-weight: bold
   @if $text-rendering
     text-rendering: optimizelegibility
-    font-style: italic
 
 =serif($text-rendering: true)
   font-family: $basic-serif

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

@@ -0,0 +1,27 @@
+=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/_color.css.sass

@@ -1,9 +1,11 @@
-=rgba($foreground, $backdrop: white, $property: "background-color")
-  #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))
-  // Browsers without color opacity
-  #{$property}: $foreground
-  // Decent browsers
-  #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))\9
-  // IE8
+// +ie-rgba(rgba(0, 0, 0, .4), white, background-color)
+=ie-rgba($foreground, $backdrop: white, $property: "background-color")
   @if $property == "background-color"
     +rgba-background($foreground)
+  @else
+    #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))
+    // Browsers without color opacity
+    #{$property}: $foreground
+    // Decent browsers
+    #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))\9
+    // IE8

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

@@ -24,7 +24,7 @@ $screen-xs-max: ($screen-sm-min - 1) !default
 $screen-sm-max: ($screen-md-min - 1) !default
 $screen-md-max: ($screen-lg-min - 1) !default
 
-// devise
+// device
 =screen-xs
   @media only screen and (max-width: $screen-xs)
     @content

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

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

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

@@ -0,0 +1,18 @@
+=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)

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

@@ -1,21 +1,22 @@
 // +list(12px 24px, fa '\f192', 12px 3px 8px)
+// +list(margin-left margin-bottom, fa '\f192', icon-size top left)
 =list($margins: null, $list-style: null, $icon-position: null)
   +rem('margin-left', optional_nth($margins, 1))
   +rem('margin-bottom', optional_nth($margins, 2))
-  content: nth($list-style, 1) == "fa"
-  @for $i from 1 through length($list-style)
-    @if list_style_type(nth($list-style, $i))
-      list-style-type: nth($list-style, $i)
-    @else if list_style_position(nth($list-style, $i))
-      list-style-position: nth($list-style, $i)
-    @else if nth($list-style, $i) == "fa"
-      list-style-type: none
-      >li
-        +relative
-        display: block
-        +rem('padding-left', optional_nth($icon-position, 1) + optional_nth($icon-position, 3))
-        &:before
-          +fa
-          +text-block(optional_nth($icon-position, 1) optional_nth($icon-position, 1))
-          content: '#{optional_nth($list-style, $i + 1)}'
-          +absolute(left 0, top optional_nth($icon-position, 2))
+  @if nth($list-style, 1) == "fa"
+    @for $i from 1 through length($list-style)
+      @if list_style_type(nth($list-style, $i))
+        list-style-type: nth($list-style, $i)
+      @else if list_style_position(nth($list-style, $i))
+        list-style-position: nth($list-style, $i)
+      @else if nth($list-style, $i) == "fa"
+        list-style-type: none
+        >li
+          +relative
+          display: block
+          +rem('padding-left', optional_nth($icon-position, 1) + optional_nth($icon-position, 3))
+          &:before
+            +fa
+            +text-block(optional_nth($icon-position, 1) optional_nth($icon-position, 1))
+            content: '#{optional_nth($list-style, $i + 1)}'
+            +absolute(left 0, top optional_nth($icon-position, 2))

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

@@ -1,5 +1,5 @@
-=overlay($overlay-color: rgba(0, 0, 0, .4), $overlay-z-index: 10)
-  +absolute(left 0, top 0, $overlay-z-index)
-  width: 100%
-  height: 100%
-  +rgba-background($overlay-color)
+=overlay($overlay-color: null, $overlay-z-index: null)
+  @if $overlay-color
+    +fixed(left 0, top 0, $overlay-z-index)
+    +size(100%)
+    +rgba-background($overlay-color)

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

@@ -0,0 +1,14 @@
+=reset-select
+  +appearance(none)
+  +border(none)
+  border: none
+  margin: 0
+  padding: 0
+  background: none transparent
+  vertical-align: middle
+  font-size: inherit
+  color: inherit
+  box-sizing: content-box
+  &:active,
+  &:focus
+    outline: none

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

@@ -1,12 +1,15 @@
 =table-cell-assign($value)
-  $padding: if(list($value), if(unit_number(nth($value, 1)), $value, null), if(unit_number($value), $value, null))
+  @if list($value)
+    @if unit_number(nth($value, 1))
+      +rem('padding', $value)
+    @if direction(nth($value, 1))
+      +padding(nth($value, 1), nth($value, 2))
   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)
 
 // +table-row($white #eeeeee, (bottom, solid 1px black))
-=table-row($value1, $value2)
+=table-row($value1: nul, $value2: nul)
   @if $value1
     @if list($value1)
       &:nth-child(odd)
@@ -19,7 +22,7 @@
     +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)
+=table-cell($value1: null, $value2: null, $value3: null)
   +box-sizing(border-box)
   @if $value1
     @for $i from 1 through length($value1)

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

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

data/lib/middleman-oulu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-oulu
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.20
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,7 @@ files:
 - assets/stylesheets/helper/_click-actions.css.sass
 - assets/stylesheets/helper/_fade-actions.css.sass
 - assets/stylesheets/helper/_margin-padding.css.sass
+- assets/stylesheets/helper/_no-gutter-grids.css.sass
 - assets/stylesheets/helper/_typoglaphy.css.sass
 - assets/stylesheets/options/amazlet/_amazlet.css.sass
 - assets/stylesheets/options/glitch/_glitch.css.sass
@@ -243,6 +244,7 @@ files:
 - assets/stylesheets/options/web-fonts/_tauri.css.sass
 - assets/stylesheets/options/web-fonts/_ubuntu-mono.css.sass
 - assets/stylesheets/options/web-fonts/_ubuntu.css.sass
+- assets/stylesheets/settings/functions/_animation.css.sass
 - assets/stylesheets/settings/functions/_background.css.sass
 - assets/stylesheets/settings/functions/_bool.css.sass
 - assets/stylesheets/settings/functions/_border.css.sass
@@ -265,18 +267,22 @@ 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.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/_image.css.sass
+- assets/stylesheets/settings/mixins/_line.css.sass
 - assets/stylesheets/settings/mixins/_link.css.sass
 - assets/stylesheets/settings/mixins/_list.css.sass
 - assets/stylesheets/settings/mixins/_margin-padding.css.sass
 - assets/stylesheets/settings/mixins/_overlay.css.sass
 - assets/stylesheets/settings/mixins/_positions.css.sass
 - assets/stylesheets/settings/mixins/_rem.css.sass
+- assets/stylesheets/settings/mixins/_reset.css.sass
 - assets/stylesheets/settings/mixins/_resets.css.sass
 - assets/stylesheets/settings/mixins/_responsive-utilities.css.sass
 - assets/stylesheets/settings/mixins/_sassmatic.css.sass