middleman-oulu 0.6.12 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e22302445d6398a69a0b50fef8870914b6d3cd8
-  data.tar.gz: 2c011e28c83f448b30e165ee72cd875d2421e6c2
+  metadata.gz: f02401ed8062e3d41be33f76bfe09d4ffd126dd2
+  data.tar.gz: 8f779de90dc1127a51efed98dbbf8e30171e019d
 SHA512:
-  metadata.gz: 75ef9c1f66387b5204f289676729bdd70593e2d8122fdd3a05ea0a57bde82fec569d08e88a0d5452dce3309957f24b063ee111bde09a69b2bbc517250f205c95
-  data.tar.gz: 891a7680ffacb54f70709ea1ed24d4c1e913c829667ba507f3d9ab21029dc8d1a227c8ee408c565d364877a0687a08ebc59d1e57751786ecaeed6ec1ecdf5adc
+  metadata.gz: 61e888df6ff427b96c48df0f91081c451004a49a8715b85ad7f98fd20383e8d1ab4071edc271376f73f5afacdcedeebef4738e96c2acfccb2b819544230332ce
+  data.tar.gz: 26e475b54e66dba3608b4c1f2086d5ef05609f1df2ef57f6cb0a71e4df4ec5e19c538aff2a0c1b7bd45e5d982050ffdf7df9fc21dbd03d2eb43d282629643a32

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

@@ -37,6 +37,9 @@ $screen-md-max: ($screen-lg-min - 1) !default
 =screen-lg
   @media only screen and (max-width: $screen-lg)
     @content
+=screen-xl
+  @media only screen and (min-width: $screen-lg)
+    @content
 
 // カラムのラッパーのクラス名
 $row-class-name: '.row' !default
@@ -52,7 +55,7 @@ $break-point-lg-namespace: 'lg-' !default
 $break-point-xl-namespace: 'xl-' !default
 
 // ブレイクポイントを配列にする
-$break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-point-md-namespace, $break-point-lg-namespace
+$break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-point-md-namespace, $break-point-lg-namespace,  $break-point-xl-namespace
 
 // デバイスごとの media query を作る
 =break-points($break-point: $break-point-xs-namespace)
@@ -67,7 +70,7 @@ $break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-poin
   @else if $screen-lg and $break-point == $break-point-lg-namespace
     @media only screen and (min-width: $screen-md)
       @content
-  @else if $break-point == $break-point-xl-namespace
+  @else if $screen-lg and $break-point == $break-point-xl-namespace
     @media only screen and (min-width: $screen-lg)
       @content
 

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

@@ -55,7 +55,7 @@ $fw: 400 !default
 $basic-sans-serif: "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "游ゴシック", YuGothic, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif !default
 $basic-legacy-ie-sans-serif: "ＭＳ Ｐゴシック", "Lucida Sans Unicode", sans-serif !default
 $basic-bold-sans-serif: "ヒラギノ角ゴ StdN", "Hiragino Kaku Gothic StdN", "メイリオ", Meiryo, Roboto, "Droid Sans", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif !default
-$basic-serif: "Times New Roman", "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", "HGS明朝E", "游明朝", YuMincho, Meiryo, serif !default
+$basic-serif: "Times New Roman", "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", "HGS明朝E", "游明朝", YuMincho,'ＭＳ Ｐ明朝','MS PMincho', serif !default
 $basic-mono: Osaka-mono, "MS Gothic", monospace !default
 $basic-maru: "Varela Round", "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "HG丸ゴシックM-PRO", "Hiragino Maru Gothic Pro", "游ゴシック", YuGothic, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif !default
 $basic-fonts: $basic-sans-serif !default

data/lib/middleman-oulu/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Oulu
-    VERSION = "0.6.12"
+    VERSION = "0.6.15"
   end
 end

metadata

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