Bump up ver

oulu · Apr 16, 2015 · 3b41ecc · 3b41ecc
1 parent 86a89f1
commit 3b41ecc
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 73 deletions.
diff --git a/lib/oulu-rails/version.rb b/lib/oulu-rails/version.rb
@@ -1,3 +1,3 @@
 module OuluRails
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end
diff --git a/vendor/assets/stylesheets/modules/buttons/_button-helper.sass b/vendor/assets/stylesheets/modules/buttons/_button-helper.sass
@@ -21,7 +21,7 @@
       +border-radius(0)
     &:first-child
       [class^="is-button"]
-        +border-left-radius(4px)
+        +border-radius(left, 4px)
     &:last-child
       [class^="is-button"]
-        +border-right-radius(4px)
+        +border-radius(right, 4px)
diff --git a/vendor/assets/stylesheets/modules/buttons/_buttons.sass b/vendor/assets/stylesheets/modules/buttons/_buttons.sass
@@ -2,12 +2,6 @@ $button-sizes: xs, sm, md, lg, xl
 $button-color-names: default, primary, success, warning, danger
 $button-styles: normal, border, flat-emboss, material
 
-// inputのスタイルを継承させる
-input[type= submit]
-  color: inherit
-  font-size: inherit
-  font-weight: inherit
-
 @import button-base
 
 // button styles
@@ -18,6 +12,12 @@ input[type= submit]
 
 @import button-helper
 
+// inputのスタイルを継承させる
+input[type= submit]
+  color: inherit
+  font-size: inherit
+  font-weight: inherit
+
 =button($style, $size, $color, $options: false)
   +button-base
   @if $style == normal

diff --git a/vendor/assets/stylesheets/options/oulu-buttons/_button-basic.sass b/vendor/assets/stylesheets/options/oulu-buttons/_button-basic.sass
diff --git a/vendor/assets/stylesheets/options/web-fonts/_cousine.sass b/vendor/assets/stylesheets/options/web-fonts/_cousine.sass
@@ -1,4 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Cousine:400,700,400italic,700italic)
+@import url(//fonts.googleapis.com/css?family=Cousine:400,700,400italic,700italic)
 
 =cousine($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル

diff --git a/vendor/assets/stylesheets/options/web-fonts/_inconsolata.sass b/vendor/assets/stylesheets/options/web-fonts/_inconsolata.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Inconsolata:400,700)
-
 =inconsolata($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Inconsolata', monospace

diff --git a/vendor/assets/stylesheets/options/web-fonts/_lato.sass b/vendor/assets/stylesheets/options/web-fonts/_lato.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic)
-
 =lato($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Lato', sans-serif

diff --git a/vendor/assets/stylesheets/options/web-fonts/_montserrat.sass b/vendor/assets/stylesheets/options/web-fonts/_montserrat.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Montserrat:400,700)
-
 // 備考:モントセラト（モントセラート、モンセラット）と読む
 =montserrat($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル

diff --git a/vendor/assets/stylesheets/options/web-fonts/_old-standard.sass b/vendor/assets/stylesheets/options/web-fonts/_old-standard.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Old+Standard+TT:400,400italic,700)
-
 =old-standard($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Old Standard TT', serif

diff --git a/vendor/assets/stylesheets/options/web-fonts/_podkova.sass b/vendor/assets/stylesheets/options/web-fonts/_podkova.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Podkova:400,700)
-
 =podkova($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Podkova', serif

diff --git a/vendor/assets/stylesheets/options/web-fonts/_pt-sans.sass b/vendor/assets/stylesheets/options/web-fonts/_pt-sans.sass
@@ -1,5 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic)
-
+@import url(//fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic)
 =pt-sans($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'PT Sans', sans-serif

diff --git a/vendor/assets/stylesheets/options/web-fonts/_satisfy.sass b/vendor/assets/stylesheets/options/web-fonts/_satisfy.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Satisfy)
-
 =satisfy($fw: null, $ls: null, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Satisfy', cursive

diff --git a/vendor/assets/stylesheets/options/web-fonts/_source-code-pro.sass b/vendor/assets/stylesheets/options/web-fonts/_source-code-pro.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Source+Code+Pro:200,300,400,500,600,700,900)
-
 // 備考:Adobeの等幅フォント
 =source-code-pro($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル

diff --git a/vendor/assets/stylesheets/options/web-fonts/_source-sans-pro.sass b/vendor/assets/stylesheets/options/web-fonts/_source-sans-pro.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,900,200italic,300italic,400italic,600italic,700italic,900italic)
-
 // 備考:Adobeのsans-serif
 =source-sans-pro($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル

diff --git a/vendor/assets/stylesheets/options/web-fonts/_special-elite.sass b/vendor/assets/stylesheets/options/web-fonts/_special-elite.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Special+Elite)
-
 =special-elite($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Special Elite', cursive

diff --git a/vendor/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass b/vendor/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass
@@ -1,5 +1,4 @@
 @import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic)
-
 =ubuntu-mono($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Ubuntu Mono', monospace

diff --git a/vendor/assets/stylesheets/options/web-fonts/_ubuntu.sass b/vendor/assets/stylesheets/options/web-fonts/_ubuntu.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic)
-
 =ubuntu($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'Ubuntu', sans-serif

diff --git a/vendor/assets/stylesheets/options/web-fonts/_vt323.sass b/vendor/assets/stylesheets/options/web-fonts/_vt323.sass
@@ -1,5 +1,4 @@
 @import url(//fonts.googleapis.com/css?family=VT323)
-
 =inconsolata($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
   // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
   font-family: 'VT323', monospace

diff --git a/vendor/assets/stylesheets/settings/mixins/_block.sass b/vendor/assets/stylesheets/settings/mixins/_block.sass
@@ -46,9 +46,6 @@
   @else
     over-flow: $over-flow-x
 
-=border-radius($values)
-  +prefixer(border-radius, $values, webkit moz spec)
-
 =inline-block($value: null)
   display: inline-block
   vertical-align: $value
@@ -59,11 +56,8 @@
 =background-clip($value)
   +prefixer(background-clip, $value, webkit moz spec)
 
-=box-shadow($values)
+=box-shadow($values...)
   +rem(box-shadow, $values)
 
-=text-shadow($values)
+=text-shadow($values...)
   +rem(text-shadow, $values)
-
-=border-radius($values)
-  +rem(border-radius, $values)
diff --git a/vendor/assets/stylesheets/settings/mixins/_border-radius.sass b/vendor/assets/stylesheets/settings/mixins/_border-radius.sass
@@ -8,20 +8,18 @@
     @for $i from 1 through length($value1)
       @if nth($value1, $i) == 'all'
         +rem('border-radius', $value2)
-      @else if vertical(nth($value1, $i))
-        +rem('border-top-radius', $value2)
-        +rem('border-bottom-radius', $value2)
-      @else if horizontal(nth($value1, $i))
-        +rem('border-left-radius', $value2)
-        +rem('border-right-radius', $value2)
       @else if top(nth($value1, $i))
-        +rem('border-top-radius', $value2)
+        +rem('border-top-left-radius', $value2)
+        +rem('border-top-right-radius', $value2)
       @else if bottom(nth($value1, $i))
-        +rem('border-bottom-radius', $value2)
+        +rem('border-bottom-left-radius', $value2)
+        +rem('border-bottom-right-radius', $value2)
       @else if left(nth($value1, $i))
-        +rem('border-left-radius', $value2)
+        +rem('border-top-left-radius', $value2)
+        +rem('border-bottom-left-radius', $value2)
       @else if right(nth($value1, $i))
-        +rem('border-right-radius', $value2)
+        +rem('border-top-right-radius', $value2)
+        +rem('border-bottom-right-radius', $value2)
 
 // 使い方
 // +reset-border-radius(vertical, 4px)