oulu-rails 0.6.11 → 0.6.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/lib/oulu-rails/version.rb +1 -1
  3. data/vendor/assets/stylesheets/_oulu-base.sass +0 -1
  4. data/vendor/assets/stylesheets/modules/buttons/_button-helper.sass +2 -2
  5. data/vendor/assets/stylesheets/modules/buttons/_buttons.sass +6 -6
  6. data/vendor/assets/stylesheets/options/web-fonts/_cousine.sass +1 -1
  7. data/vendor/assets/stylesheets/options/web-fonts/_inconsolata.sass +0 -1
  8. data/vendor/assets/stylesheets/options/web-fonts/_lato.sass +0 -1
  9. data/vendor/assets/stylesheets/options/web-fonts/_montserrat.sass +0 -1
  10. data/vendor/assets/stylesheets/options/web-fonts/_old-standard.sass +0 -1
  11. data/vendor/assets/stylesheets/options/web-fonts/_podkova.sass +0 -1
  12. data/vendor/assets/stylesheets/options/web-fonts/_pt-sans.sass +1 -2
  13. data/vendor/assets/stylesheets/options/web-fonts/_satisfy.sass +0 -1
  14. data/vendor/assets/stylesheets/options/web-fonts/_source-code-pro.sass +0 -1
  15. data/vendor/assets/stylesheets/options/web-fonts/_source-sans-pro.sass +0 -1
  16. data/vendor/assets/stylesheets/options/web-fonts/_special-elite.sass +0 -1
  17. data/vendor/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass +1 -2
  18. data/vendor/assets/stylesheets/options/web-fonts/_ubuntu.sass +0 -1
  19. data/vendor/assets/stylesheets/options/web-fonts/_vt323.sass +0 -1
  20. data/vendor/assets/stylesheets/settings/mixins/_block.sass +2 -8
  21. data/vendor/assets/stylesheets/settings/mixins/_border-radius.sass +8 -10
  22. metadata +2 -4
  23. data/vendor/assets/stylesheets/options/oulu-buttons/_button-basic.sass +0 -31
  24. data/vendor/assets/stylesheets/settings/mixins/_color.sass +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f7485ac685a4ac87659d8c801f2c0d4097f60a71
4
- data.tar.gz: 1faa5265f9876f82f67aab94647d368d34052562
3
+ metadata.gz: 15440402b5233954d1e05d65dc1a26084ab28570
4
+ data.tar.gz: 6ae6ff8a40f1fa50b1ca4922fe4e2001dc3b22c8
5
5
  SHA512:
6
- metadata.gz: a5ce167d4c8776f56b8b75833ddebeaf7a7e24866e24f02b6884af1151399bac4031cd4da5cf8a52f73bd60f055f4eadfac96a648c5af9c66a1d50862303ad03
7
- data.tar.gz: d42fc50824c7446a35ca181dbd91223fad05f6162781f5ebbf60857176c4ef334ee78d3a7ceabde2952aecb14bcbb7518cf177587089c409cf4489e7449e1603
6
+ metadata.gz: 113f94eccef4089b09ac829c7668c527067bfeb5ee3c1ca010d54a8b6f6984d1c202a51bf8d25ba7691a8fa8cd58464b6696db1166df41c5d8202f3f5007b914
7
+ data.tar.gz: 02cb9d8e52310b8131b71766bcd9c270db3621cff5e8223eeeaff627e94c7df27188c2165bb18cdda787b2ffbd03f6e9b52d4eabffdac45575aa5e0403235376
data/lib/oulu-rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OuluRails
2
- VERSION = "0.6.11"
2
+ VERSION = "0.6.12"
3
3
  end
data/vendor/assets/stylesheets/_oulu-base.sass CHANGED
@@ -44,7 +44,6 @@
44
44
  @import settings/mixins/border-radius
45
45
  @import settings/mixins/table
46
46
  @import settings/mixins/list
47
- @import settings/mixins/color
48
47
  @import settings/mixins/overlay
49
48
  @import settings/mixins/balloon-tail
50
49
  @import settings/mixins/margin-padding
data/vendor/assets/stylesheets/modules/buttons/_button-helper.sass CHANGED
@@ -21,7 +21,7 @@
21
21
  +border-radius(0)
22
22
  &:first-child
23
23
  [class^="is-button"]
24
- +border-left-radius(4px)
24
+ +border-radius(left, 4px)
25
25
  &:last-child
26
26
  [class^="is-button"]
27
- +border-right-radius(4px)
27
+ +border-radius(right, 4px)
data/vendor/assets/stylesheets/modules/buttons/_buttons.sass CHANGED
@@ -2,12 +2,6 @@ $button-sizes: xs, sm, md, lg, xl
2
2
  $button-color-names: default, primary, success, warning, danger
3
3
  $button-styles: normal, border, flat-emboss, material
4
4
 
5
- // inputのスタイルを継承させる
6
- input[type= submit]
7
- color: inherit
8
- font-size: inherit
9
- font-weight: inherit
10
-
11
5
  @import button-base
12
6
 
13
7
  // button styles
@@ -18,6 +12,12 @@ input[type= submit]
18
12
 
19
13
  @import button-helper
20
14
 
15
+ // inputのスタイルを継承させる
16
+ input[type= submit]
17
+ color: inherit
18
+ font-size: inherit
19
+ font-weight: inherit
20
+
21
21
  =button($style, $size, $color, $options: false)
22
22
  +button-base
23
23
  @if $style == normal
data/vendor/assets/stylesheets/options/web-fonts/_cousine.sass CHANGED
@@ -1,4 +1,4 @@
1
- @import url(http://fonts.googleapis.com/css?family=Cousine:400,700,400italic,700italic)
1
+ @import url(//fonts.googleapis.com/css?family=Cousine:400,700,400italic,700italic)
2
2
 
3
3
  =cousine($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
4
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
data/vendor/assets/stylesheets/options/web-fonts/_inconsolata.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Inconsolata:400,700)
2
-
3
2
  =inconsolata($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Inconsolata', monospace
data/vendor/assets/stylesheets/options/web-fonts/_lato.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic)
2
-
3
2
  =lato($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Lato', sans-serif
data/vendor/assets/stylesheets/options/web-fonts/_montserrat.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Montserrat:400,700)
2
-
3
2
  // 備考:モントセラト（モントセラート、モンセラット）と読む
4
3
  =montserrat($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
5
4
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
data/vendor/assets/stylesheets/options/web-fonts/_old-standard.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Old+Standard+TT:400,400italic,700)
2
-
3
2
  =old-standard($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Old Standard TT', serif
data/vendor/assets/stylesheets/options/web-fonts/_podkova.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Podkova:400,700)
2
-
3
2
  =podkova($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Podkova', serif
data/vendor/assets/stylesheets/options/web-fonts/_pt-sans.sass CHANGED
@@ -1,5 +1,4 @@
1
- @import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic)
2
-
1
+ @import url(//fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic)
3
2
  =pt-sans($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'PT Sans', sans-serif
data/vendor/assets/stylesheets/options/web-fonts/_satisfy.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Satisfy)
2
-
3
2
  =satisfy($fw: null, $ls: null, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Satisfy', cursive
data/vendor/assets/stylesheets/options/web-fonts/_source-code-pro.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Source+Code+Pro:200,300,400,500,600,700,900)
2
-
3
2
  // 備考:Adobeの等幅フォント
4
3
  =source-code-pro($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
5
4
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
data/vendor/assets/stylesheets/options/web-fonts/_source-sans-pro.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,900,200italic,300italic,400italic,600italic,700italic,900italic)
2
-
3
2
  // 備考:Adobeのsans-serif
4
3
  =source-sans-pro($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
5
4
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
data/vendor/assets/stylesheets/options/web-fonts/_special-elite.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Special+Elite)
2
-
3
2
  =special-elite($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Special Elite', cursive
data/vendor/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass CHANGED
@@ -1,5 +1,4 @@
1
- @import url(http://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic)
2
-
1
+ @import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic)
3
2
  =ubuntu-mono($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Ubuntu Mono', monospace
data/vendor/assets/stylesheets/options/web-fonts/_ubuntu.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic)
2
-
3
2
  =ubuntu($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'Ubuntu', sans-serif
data/vendor/assets/stylesheets/options/web-fonts/_vt323.sass CHANGED
@@ -1,5 +1,4 @@
1
1
  @import url(//fonts.googleapis.com/css?family=VT323)
2
-
3
2
  =inconsolata($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
4
  font-family: 'VT323', monospace
data/vendor/assets/stylesheets/settings/mixins/_block.sass CHANGED
@@ -46,9 +46,6 @@
46
46
  @else
47
47
  over-flow: $over-flow-x
48
48
 
49
- =border-radius($values)
50
- +prefixer(border-radius, $values, webkit moz spec)
51
-
52
49
  =inline-block($value: null)
53
50
  display: inline-block
54
51
  vertical-align: $value
@@ -59,11 +56,8 @@
59
56
  =background-clip($value)
60
57
  +prefixer(background-clip, $value, webkit moz spec)
61
58
 
62
- =box-shadow($values)
59
+ =box-shadow($values...)
63
60
  +rem(box-shadow, $values)
64
61
 
65
- =text-shadow($values)
62
+ =text-shadow($values...)
66
63
  +rem(text-shadow, $values)
67
-
68
- =border-radius($values)
69
- +rem(border-radius, $values)
data/vendor/assets/stylesheets/settings/mixins/_border-radius.sass CHANGED
@@ -8,20 +8,18 @@
8
8
  @for $i from 1 through length($value1)
9
9
  @if nth($value1, $i) == 'all'
10
10
  +rem('border-radius', $value2)
11
- @else if vertical(nth($value1, $i))
12
- +rem('border-top-radius', $value2)
13
- +rem('border-bottom-radius', $value2)
14
- @else if horizontal(nth($value1, $i))
15
- +rem('border-left-radius', $value2)
16
- +rem('border-right-radius', $value2)
17
11
  @else if top(nth($value1, $i))
18
- +rem('border-top-radius', $value2)
12
+ +rem('border-top-left-radius', $value2)
13
+ +rem('border-top-right-radius', $value2)
19
14
  @else if bottom(nth($value1, $i))
20
- +rem('border-bottom-radius', $value2)
15
+ +rem('border-bottom-left-radius', $value2)
16
+ +rem('border-bottom-right-radius', $value2)
21
17
  @else if left(nth($value1, $i))
22
- +rem('border-left-radius', $value2)
18
+ +rem('border-top-left-radius', $value2)
19
+ +rem('border-bottom-left-radius', $value2)
23
20
  @else if right(nth($value1, $i))
24
- +rem('border-right-radius', $value2)
21
+ +rem('border-top-right-radius', $value2)
22
+ +rem('border-bottom-right-radius', $value2)
25
23
 
26
24
  // 使い方
27
25
  // +reset-border-radius(vertical, 4px)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oulu-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.11
4
+ version: 0.6.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-15 00:00:00.000000000 Z
11
+ date: 2015-04-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass-rails
@@ -182,7 +182,6 @@ files:
182
182
  - vendor/assets/stylesheets/modules/navs/_tabs-nav.sass
183
183
  - vendor/assets/stylesheets/options/amazlet/_amazlet.sass
184
184
  - vendor/assets/stylesheets/options/glitch/_glitch.sass
185
- - vendor/assets/stylesheets/options/oulu-buttons/_button-basic.sass
186
185
  - vendor/assets/stylesheets/options/web-fonts/_cousine.sass
187
186
  - vendor/assets/stylesheets/options/web-fonts/_font-awsome.sass
188
187
  - vendor/assets/stylesheets/options/web-fonts/_icomoon.sass
@@ -229,7 +228,6 @@ files:
229
228
  - vendor/assets/stylesheets/settings/mixins/_block.sass
230
229
  - vendor/assets/stylesheets/settings/mixins/_border-radius.sass
231
230
  - vendor/assets/stylesheets/settings/mixins/_border.sass
232
- - vendor/assets/stylesheets/settings/mixins/_color.sass
233
231
  - vendor/assets/stylesheets/settings/mixins/_filters.sass
234
232
  - vendor/assets/stylesheets/settings/mixins/_form.sass
235
233
  - vendor/assets/stylesheets/settings/mixins/_grids.sass
data/vendor/assets/stylesheets/options/oulu-buttons/_button-basic.sass DELETED
@@ -1,31 +0,0 @@
1
- =button-basic($bt-fz: 16px, $bt-ht: 30px, $bt-icon-pt: null)
2
- display: inline-block
3
- +text-block($bt-fz, $bt-ht)
4
- +rem('height', $bt-ht)
5
- +rem('padding-left', $bt-fz*.9)
6
- +rem('padding-right', $bt-fz*.9)
7
- cursor: pointer
8
- text-align: center
9
- text-decoration: none
10
- @if $bt-icon-pt == "right"
11
- >i
12
- +rem('margin-left', $bt-fz/6)
13
- @else if $bt-icon-pt == "left"
14
- >i
15
- +rem('margin-right', $bt-fz/6)
16
-
17
- =icon-button-basic($bt-fz: 18px, $bt-ht: 30px)
18
- display: inline-block
19
- +text-block($bt-fz, $bt-ht)
20
- +rem('height', $bt-ht)
21
- +rem('width', $bt-fz*1.6)
22
- cursor: pointer
23
- text-align: center
24
- text-decoration: none
25
-
26
- =border-style-border($bt-cl: red, $bt-bd-wd: 2px)
27
- +border(all, $bt-bd-wd, solid, $bt-cl)
28
- color: $bt-cl
29
- &:hover
30
- background-color: $bt-cl
31
- color: #ffffff
data/vendor/assets/stylesheets/settings/mixins/_color.sass DELETED
@@ -1,11 +0,0 @@
1
- // +ie-rgba(rgba(black, .4), white, background-color)
2
- =ie-rgba($foreground, $backdrop: white, $property: "background-color")
3
- @if $property == "background-color"
4
- background-color: $foreground
5
- @else
6
- #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))
7
- // Browsers without color opacity
8
- #{$property}: $foreground
9
- // Decent browsers
10
- #{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))\9
11
- // IE8