oulu-rails 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a41503a22bfaa91c20a0822774a841b66bcc0d3f
-  data.tar.gz: 17b8f2144bd3c27d56cdebb3be47778aa18cd246
+  metadata.gz: 7cc02577935cc850eb539e0018cf8f19b3c870c7
+  data.tar.gz: 9cf37168a8a6b39a5708850c6c53d25e08cedf20
 SHA512:
-  metadata.gz: 58c59c6439d5143affc3770a3eaac125e20545c581714a78a67366b90b4672719f094aef77e400c96481358776323dc5c2355e47719f74cf23291db7920ab2af
-  data.tar.gz: 607c29b656b466f90cc973ca92a985c0707d7fe5a27c6b08e3885635bc734715212d6db061e98780825693db0823f42d31f90991c677e920890dc46f4a30442c
+  metadata.gz: f929bd6881fd463834e7da5d069181492c8ddd1d62033ce157ed9594d06f7bbc3ef72dea3878a9b9a634f5daa189551f99506e0aa50df44817b5a2366a258255
+  data.tar.gz: 0c4fecbc0fb96a0934d46a8b92adc99fefbc3ee09fca014074313dcd7bb485c04727778b5f6a1c022f28f965bd224da1c01d929bf7397d4f2abd85d60fb33775

data/lib/oulu-rails/version.rb

@@ -1,3 +1,3 @@
 module OuluRails
-  VERSION = "0.5.22"
+  VERSION = "0.5.23"
 end

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

@@ -46,6 +46,7 @@
 @import settings/functions/background
 @import settings/functions/border
 @import settings/functions/animation
+@import settings/functions/grid
 
 // mixins
 ///////////////////

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

@@ -0,0 +1,34 @@
+@function gutter_width($value)
+  @if $value == 0 or px($value)
+    @return true
+  @else
+    @return null
+
+@function columns_count($value)
+  @if unitless_number($value)
+    @if $value > 0
+      @return true
+    @else
+      @return null
+  @else
+    @return null
+
+@function break_point($value)
+  @if string($value) and ($value == 'xs' or $value == 'sm' or $value == 'md' or $value == 'lg' or $value == 'xl')
+    @return true
+  @else if list($value) and (nth($value, 1) == 'xs' or nth($value, 1) == 'sm' or nth($value, 1) == 'md' or nth($value, 1) == 'lg' or nth($value, 1) == 'xl')
+    @return true
+  @else
+    @return null
+
+@function row_class_name($value)
+  @if string($value) and str-slice($value, 1, 1) == ('.')
+    @return true
+  @else
+    @return null
+
+@function offsets($value)
+  @if string($value) and $value == offsets
+    @return true
+  @else
+    @return null

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

@@ -38,7 +38,6 @@ $screen-md-max: ($screen-lg-min - 1) !default
   @media only screen and (max-width: $screen-lg)
     @content
 
-
 // カラムのラッパーのクラス名
 $row-class-name: '.row' !default
 // カラムのネームスペース ※classの".（カンマ）"もネームスペースの一部
@@ -50,6 +49,7 @@ $break-point-xs-namespace: 'xs-' !default
 $break-point-sm-namespace: 'sm-' !default
 $break-point-md-namespace: 'md-' !default
 $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
@@ -67,7 +67,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 $screen-xl and $break-point == $break-point-xl-namespace
+  @else if $break-point == $break-point-xl-namespace
     @media only screen and (min-width: $screen-lg)
       @content
 
@@ -77,24 +77,18 @@ $break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-poin
   +margin(horizontal, ($gutter-width / 2) * -1)
   // clearfix
   +rem('min-height', 1px)
-  &:before,
-  &:after
-    display: table
-    content: " "
-  &:after
-    clear: both
+  +pie-clearfix
 
 // カラムの基本設定
 =column($number, $columns-gutter-width: $gutter-width)
   +rem('width', 100 / $columns-count * $number * 1%)
-  +rem('min-height', 1px)
   +padding(horizontal, $columns-gutter-width / 2)
-  float: left
   +box-sizing(border-box)
+  float: left
 
 // カラムをサイズごとに作る
 @each $break-point in $break-points
-  +break-points(#{$break-point})
+  +break-points($break-point)
     @for $i from 1 through $columns-count
       #{$column-namespace}#{$break-point}#{$i}
         +column($i)
@@ -105,47 +99,46 @@ $break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-poin
 
 // オフセットカラムをサイズごとに作る
 @each $break-point in $break-points
-  +break-points(#{$break-point})
+  +break-points($break-point)
     @for $i from 1 through $columns-count
       #{$column-namespace}#{$break-point}#{$column-offset-namespace}#{$i}
         +column-offset($i)
 
-function
-
-=grid-columns($columns-gutter-width: $gutter-width, $grid-columns-row-class-name: '.row')
-  #{$grid-columns-row-class-name}
-    // カラムのマージン分だけ両サイドにネガティブマージンを取る
-    +margin(horizontal, ($columns-gutter-width / 2) * -1)
-    // clearfix
-    +rem('min-height', 1px)
-    &:before,
-    &:after
-      display: table
-      content: " "
-    &:after
-      clear: both
-  // カラムをサイズごとに作る
-  @each $break-point in $break-points
-    +break-points(#{$break-point})
-      @for $i from 1 through $columns-count
-        #{$column-namespace}#{$break-point}#{$i}
-          +column($i, $columns-gutter-width)
-
-=grid-column-offsets($columns-gutter-width: $gutter-width, $grid-columns-row-class-name: '.row')
+=grid-columns($values)
+  $columns-gutter-width: 0 !default
+  $temp-columns-count: 12 !default
+  $temp-break-points: 'xs', 'sm', 'md', 'lg' !default
+  $grid-columns-row-class-name: '.row' !default
+  $offsets: false !default
+  @for $i from 1 through length($values)
+    @if gutter_width(nth($values, $i))
+      $columns-gutter-width: nth($values, $i)
+    @else if columns_count(nth($values, $i))
+      $temp-columns-count: nth($values, $i)
+    @else if break_point(nth($values, $i))
+      $temp-break-points: nth($values, $i)
+    @else if row_class_name(nth($values, $i))
+      $grid-columns-row-class-name: nth($values, $i)
+    @else if offsets(nth($values, $i))
+      $offsets: nth($values, $i)
   #{$grid-columns-row-class-name}
     // カラムのマージン分だけ両サイドにネガティブマージンを取る
     +margin(horizontal, ($columns-gutter-width / 2) * -1)
-    // clearfix
-    +rem('min-height', 1px)
-    &:before,
-    &:after
-      display: table
-      content: " "
-    &:after
-      clear: both
-  // オフセットカラムをサイズごとに作る
-  @each $break-point in $break-points
-    +break-points(#{$break-point})
-      @for $i from 1 through $columns-count
-        #{$column-namespace}#{$break-point}#{$column-offset-namespace}#{$i}
-          +column-offset($i)
+    +pie-clearfix
+    // カラムをサイズごとに作る
+    $break-points: ()
+    @each $temp-break-point in $temp-break-points
+      $break-points: append($break-points, if($temp-break-point == 'xs', $break-point-xs-namespace, null))
+      $break-points: append($break-points, if($temp-break-point == 'sm', $break-point-sm-namespace, null))
+      $break-points: append($break-points, if($temp-break-point == 'md', $break-point-md-namespace, null))
+      $break-points: append($break-points, if($temp-break-point == 'lg', $break-point-lg-namespace, null))
+      $break-points: append($break-points, if($temp-break-point == 'xl', $break-point-xl-namespace, null))
+    content: $temp-columns-count
+    @each $break-point in $break-points
+      +break-points($break-point)
+        @for $i from 1 through $temp-columns-count
+          #{$column-namespace}#{$break-point}#{$i}
+            +column($i, $columns-gutter-width)
+          @if $offsets
+            #{$column-namespace}#{$break-point}#{$column-offset-namespace}#{$i}
+              +column-offset($i)

data/vendor/assets/stylesheets/settings/mixins/_responsive-utilities.css.sass

@@ -1,4 +1,4 @@
-// https://github.com/twbs/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
+// https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_responsive-utilities.scss
 
 =responsive-visibility($parent)
   #{$parent}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oulu-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.23
 platform: ruby
 authors:
 - machida
@@ -348,6 +348,7 @@ files:
 - vendor/assets/stylesheets/settings/functions/_color.css.sass
 - vendor/assets/stylesheets/settings/functions/_content.css.sass
 - vendor/assets/stylesheets/settings/functions/_cursor.css.sass
+- vendor/assets/stylesheets/settings/functions/_grid.css.sass
 - vendor/assets/stylesheets/settings/functions/_image.css.sass
 - vendor/assets/stylesheets/settings/functions/_length.css.sass
 - vendor/assets/stylesheets/settings/functions/_list.css.sass