positionに関するmixinの書き方を変更

oulu · Oct 7, 2015 · 15f2328 · 15f2328
1 parent 595152f
commit 15f2328
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 43 deletions.
diff --git a/lib/oulu-rails/version.rb b/lib/oulu-rails/version.rb
@@ -1,3 +1,3 @@
 module OuluRails
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end
diff --git a/vendor/assets/stylesheets/helpers/_block.sass b/vendor/assets/stylesheets/helpers/_block.sass
@@ -1,7 +1,7 @@
 body
   // layout
   .has-no-gutter-grids
-    +gird(0)
+    +grid(0)
   .is-horizontal-center-block
     display: block
     +margin(horizontal, auto)
@@ -59,7 +59,7 @@ body
     +fixed(left 0, top 0)
     width: 100%
   .is-z-index-100
-    +relative(100)
+    +position(relative, 100)
 
   // vertical-align
   .is-vertical-middle

diff --git a/vendor/assets/stylesheets/modules/buttons/_button-base.sass b/vendor/assets/stylesheets/modules/buttons/_button-base.sass
@@ -48,10 +48,10 @@
         +rem('margin-left', $font-size/3)
   &.is-input-container
     padding: 0
-    +relative
+    position: relative
     i,
     .is-button-icon
-      +absolute(left $height/2, top 0)
+      +position(absolute, left $height/2, top 0)
       +rem('line-height', $height - ($border-width*2))
     input
       +padding(horizontal, ($height + if($font-size > 28, $font-size/4, $font-size/3)) $height/2)

diff --git a/vendor/assets/stylesheets/modules/buttons/styles/_material.sass b/vendor/assets/stylesheets/modules/buttons/styles/_material.sass
@@ -1,10 +1,10 @@
 =waves-effect($color: black)
-  +relative(1)
+  +position(relative, 1)
   overflow: hidden
   will-change: opacity, transform
   +transition(all .3s ease-out)
   .waves-ripple
-    +absolute
+    position: absolute
     border-radius: 50%
     +block-size(20px)
     +rem('margin-top', -10px)
@@ -75,7 +75,7 @@
   border-radius: 0.2em
   vertical-align: bottom
   .waves-button-input
-    +relative(1, top 0, left 0)
+    +position(relative, 1, top 0, left 0)
 .waves-circle
   text-align: center
   +size(2.5em)

diff --git a/vendor/assets/stylesheets/modules/navs/_tabs-nav.sass b/vendor/assets/stylesheets/modules/navs/_tabs-nav.sass
@@ -8,13 +8,13 @@ $tabs-nav-current-font-color: red !default
 
 .tabs-nav__items
   font-size: 0
-  +relative
+  position: relative
   &:before
     content: ""
     display: block
     +block-size(100% $tabs-nav-border-width)
     background-color: $tabs-nav-border-color
-    +absolute(left 0, bottom 0)
+    +position(absolute, left 0, bottom 0)
 .tabs-nav__item
   +inline-block(bottom)
   +rem('margin-right', 8px)
@@ -27,12 +27,12 @@ $tabs-nav-current-font-color: red !default
   +text-block($tabs-nav-font-size round($tabs-nav-font-size*2.6), center $tabs-nav-font-color)
   +padding(horizontal, $tabs-nav-font-size*1.6)
   box-sizing: border-box
-  +relative
+  position: relative
   &:before
     display: block
     +block-size(100% $tabs-nav-border-width)
     background-color: $tabs-nav-background-color
-    +absolute(left 0, bottom 0)
+    +position(absolute, left 0, bottom 0)
   &.is-current
     color: $tabs-nav-current-font-color
     &:before

diff --git a/vendor/assets/stylesheets/options/glitch/_glitch.sass b/vendor/assets/stylesheets/options/glitch/_glitch.sass
@@ -10,7 +10,7 @@
       clip: rect(random(100) + px, 9999px, random(100) + px, 0)
 
 =glitch($cl: white, $bg-col: black)
-  +relative
+  position: relative
   overflow: hidden
   display: inline-block
   color: $cl
@@ -22,10 +22,10 @@
     overflow: hidden
     clip: rect(0, 900px, 0, 0)
   &:after
-    +absolute(left 1px, top 0)
+    +position(absolute, left 1px, top 0)
     +rem('text-shadow', -1px 0 0 rgba(red, 0.4))
     +animation(noise-anim 2s infinite linear alternate-reverse)
   &:before
-    +absolute(left -1px, top 0)
+    +position(absolute, left -1px, top 0)
     +rem('text-shadow', 1px 0 0 rgba(blue, 0.4))
     +animation(noise-anim-2 3s infinite linear alternate-reverse)
diff --git a/vendor/assets/stylesheets/options/web-fonts/_font-awsome.sass b/vendor/assets/stylesheets/options/web-fonts/_font-awsome.sass
@@ -1,17 +1,17 @@
-=fa
+=fa($icon: null)
   display: inline-block
   font-family: FontAwesome
   font-style: normal
   font-weight: normal
   line-height: 1
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
+  content: "#{$icon}"
 
 =fa-icon($icon: '\f105', $size: 16px 12px, $options: null, $position1:null, $position2: null)
   &:before
-    +fa
-    content: "#{$icon}"
+    +fa($icon)
     @if $position1
-      +absolute(if($position1, $position1, null), if($position2, $position2, null))
+      +position(absolute, if($position1, $position1, null), if($position2, $position2, null))
     @if $size
       +text-block($size, $options)
diff --git a/vendor/assets/stylesheets/settings/initializers/_reset.sass b/vendor/assets/stylesheets/settings/initializers/_reset.sass
@@ -15,6 +15,8 @@
     display: block
 body
   line-height: 1
+*
+  box-sizing: border-box
 ol, ul
   list-style: none
 blockquote, q

diff --git a/vendor/assets/stylesheets/settings/mixins/_grid.sass b/vendor/assets/stylesheets/settings/mixins/_grid.sass
@@ -81,8 +81,8 @@
 [class^="col-"]
   box-sizing: border-box
 
-=gird($gutter-size)
+=grid($gutter-size)
   &.row
     +margin(horizontal, $gutter-size/2 * -1)
-    >[class^="col-"]
+    >*
       +padding(horizontal, $gutter-size/2)
diff --git a/vendor/assets/stylesheets/settings/mixins/_list.sass b/vendor/assets/stylesheets/settings/mixins/_list.sass
@@ -7,14 +7,13 @@
     @if nth($list-style, $i) == "fa"
       list-style-type: none
       >li
-        +relative
+        position: relative
         display: block
         +rem('padding-left', optional_nth($icon-position, 1) + optional_nth($icon-position, 3))
         &:before
-          +fa
+          +fa(optional_nth($list-style, $i + 1))
           +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))
+          +position(absolute, left 0, top optional_nth($icon-position, 2))
     @else if list_style_type(nth($list-style, $i))
       list-style-type: nth($list-style, $i)
     @else if list_style_position(nth($list-style, $i))

diff --git a/vendor/assets/stylesheets/settings/mixins/_positions.sass b/vendor/assets/stylesheets/settings/mixins/_positions.sass
@@ -1,28 +1,33 @@
-=position-list($value1, $value2, $value3, $value4, $value5)
-  $values: $value1 $value2 $value3 $value4 $value5
+=position-list($value1, $value2, $value3, $value4, $value5, $value6)
+  $values: $value1 $value2 $value3 $value4 $value5 $value6
   @each $value in $values
     @if optional_nth($value, 2)
       +rem(nth($value, 1), nth($value, 2))
-    @else
+    @else if unitless_number($value)
       z-index: nth($value, 1)
+    @else
+      position: $value
 
-=absolute($value1: null, $value2: null, $value3: null, $value4: null, $value5: null)
+=absolute($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null)
   position: absolute
-  +position-list($value1, $value2, $value3, $value4, $value5)
+  +position-list($value1, $value2, $value3, $value4, $value5, $value6)
 
-=fixed($value1: null, $value2: null, $value3: null, $value4: null, $value5: null)
+=fixed($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null)
   position: fixed
-  +position-list($value1, $value2, $value3, $value4, $value5)
+  +position-list($value1, $value2, $value3, $value4, $value5, $value6)
 
-=relative($value1: null, $value2: null, $value3: null, $value4: null, $value5: null)
+=relative($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null)
   position: relative
-  +position-list($value1, $value2, $value3, $value4, $value5)
+  +position-list($value1, $value2, $value3, $value4, $value5, $value6)
+
+=position($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null)
+  +position-list($value1, $value2, $value3, $value4, $value5, $value6)
 
-=top($position-value, $z-index: null)
-  +relative(top $position-value, $z-index)
-=bottom($position-value, $z-index: null)
-  +relative(bottom $position-value, $z-index)
-=left($position-value, $z-index: null)
-  +relative(left $position-value, $z-index)
-=right($position-value, $z-index: null)
-  +relative(right $position-value, $z-index)
+=top($position, $z-index: null)
+  +relative(top $position, $z-index)
+=bottom($position, $z-index: null)
+  +relative(bottom $position, $z-index)
+=left($position, $z-index: null)
+  +relative(left $position, $z-index)
+=right($position, $z-index: null)
+  +relative(right $position, $z-index)
diff --git a/vendor/assets/stylesheets/settings/mixins/_rem.sass b/vendor/assets/stylesheets/settings/mixins/_rem.sass
@@ -12,7 +12,7 @@ $baseline-px: 10px !default
   font-size: strip_unit($baseline-px / 10) * 1rem
 
 =rem($property, $px-values, $important: null)
-  @if px($px-values) or list($px-values)
+  @if $rem == true and px($px-values) or list($px-values)
     @if $property == "font-size" and $px-values < 10px
       // 9px以下のfont-sizeを使う設定（IE8不可）
       +base-font-size

diff --git a/vendor/assets/stylesheets/settings/variables/_default.sass b/vendor/assets/stylesheets/settings/variables/_default.sass
@@ -1,3 +1,9 @@
+/////////////////
+// rem
+////////////////
+
+$rem: false
+
 /////////////////
 // positions
 ////////////////