oulu 0.9.4 → 0.9.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/helpers/_margin-padding.sass +36 -36
  3. data/app/assets/stylesheets/helpers/_position.sass +4 -4
  4. data/app/assets/stylesheets/modules/buttons/_button-base.sass +7 -7
  5. data/app/assets/stylesheets/modules/buttons/_button-helper.sass +2 -2
  6. data/app/assets/stylesheets/modules/buttons/styles/_material.sass +5 -8
  7. data/app/assets/stylesheets/modules/navs/_tabs-nav.sass +2 -2
  8. data/app/assets/stylesheets/options/amazlet/_amazlet.sass +5 -5
  9. data/app/assets/stylesheets/options/glitch/_glitch.sass +2 -2
  10. data/app/assets/stylesheets/options/web-fonts/_open-sans.sass +1 -1
  11. data/app/assets/stylesheets/options/web-fonts/_roboto-mono.sass +11 -0
  12. data/app/assets/stylesheets/settings/initializers/_sanitize.sass +0 -26
  13. data/app/assets/stylesheets/settings/mixins/_balloon-tail.sass +13 -13
  14. data/app/assets/stylesheets/settings/mixins/_block.sass +11 -20
  15. data/app/assets/stylesheets/settings/mixins/_border-radius.sass +10 -10
  16. data/app/assets/stylesheets/settings/mixins/_border.sass +1 -1
  17. data/app/assets/stylesheets/settings/mixins/_grid.sass +1 -20
  18. data/app/assets/stylesheets/settings/mixins/_line.sass +2 -2
  19. data/app/assets/stylesheets/settings/mixins/_list.sass +3 -3
  20. data/app/assets/stylesheets/settings/mixins/_margin-padding.sass +38 -38
  21. data/app/assets/stylesheets/settings/mixins/_positions.sass +1 -1
  22. data/app/assets/stylesheets/settings/mixins/_rem.sass +26 -42
  23. data/app/assets/stylesheets/settings/mixins/_table.sass +1 -1
  24. data/app/assets/stylesheets/settings/mixins/_text.sass +10 -5
  25. data/app/assets/stylesheets/settings/variables/_default.sass +34 -20
  26. data/bower.json +1 -1
  27. data/lib/oulu/version.rb +1 -1
  28. data/package.json +1 -1
  29. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4e48020281ccce2487a555d597f8be1b92990edb
4
- data.tar.gz: 8ac27ab2898b54df87235150964d919e05566b56
3
+ metadata.gz: f6626fe7ad171917583c1e26e119d9fd6b84cf01
4
+ data.tar.gz: 973f1a0c152fb9d17df478769d2b3ffae36c1e0e
5
5
  SHA512:
6
- metadata.gz: ae4832f28899bf8361e5c4bc9ade0eb0865407936b2e8c63f162a6387ba05e280ca02f883ad51f96ed0573be8a1fb142c4db4f258d508a5f8f8bddd8621d92c7
7
- data.tar.gz: 54a23d61338d13e2c54bbd6719f1fa8963a5d43295fec285d0c5e2a6aadea6cb5566ddd201b168490de330923a4445df56dc0f8f592b75222348173d547b8440
6
+ metadata.gz: ce70af554ea4ace32ed56ce2b50c566b88cb01fc156ded574b15d076d8802f3877fb21cf34e0f6024186c1ecef4ef3b7004d23d165acd9083bab6f54a17972df
7
+ data.tar.gz: 120371ec102de6e2b1d95a1b8e13ff9dbd5b0b6dfd9558040bc61fbe732de44f25651eb9235d24062812103a0a63d661ec51e198ab55274cfb60a20a3665dc42
@@ -1,25 +1,25 @@
1
1
  body
2
2
  @for $i from 0 through 20
3
- .is-margin-bottom-#{$i*4}
4
- +rem('margin-bottom', #{$i*4}px)
5
- .is-margin-top-#{$i*4}
6
- +rem('margin-top', #{$i*4}px)
7
- .is-margin-left-#{$i*4}
8
- +rem('margin-left', #{$i*4}px)
9
- .is-margin-right-#{$i*4}
10
- +rem('margin-right', #{$i*4}px)
11
- .is-margin-horizontal-#{$i*4}
12
- +margin(horizontal, #{$i*4}px)
13
- .is-padding-bottom-#{$i*4}
14
- +rem('padding-bottom', #{$i*4}px)
15
- .is-padding-top-#{$i*4}
16
- +rem('padding-top', #{$i*4}px)
17
- .is-padding-left-#{$i*4}
18
- +rem('padding-left', #{$i*4}px)
19
- .is-padding-right-#{$i*4}
20
- +rem('padding-right', #{$i*4}px)
21
- .is-padding-horizontal-#{$i*4}
22
- +padding(horizontal, #{$i*4}px)
3
+ .is-margin-bottom-#{$i*4px}
4
+ margin-bottom: $i*4px
5
+ .is-margin-top-#{$i*4px}
6
+ margin-top: $i*4px
7
+ .is-margin-left-#{$i*4px}
8
+ margin-left: $i*4px
9
+ .is-margin-right-#{$i*4px}
10
+ margin-right: $i*4px
11
+ .is-margin-horizontal-#{$i*4px}
12
+ +margin(horizontal, $i*4px)
13
+ .is-padding-bottom-#{$i*4px}
14
+ padding-bottom: $i*4px
15
+ .is-padding-top-#{$i*4px}
16
+ padding-top: $i*4px
17
+ .is-padding-left-#{$i*4px}
18
+ padding-left: $i*4px
19
+ .is-padding-right-#{$i*4px}
20
+ padding-right: $i*4px
21
+ .is-padding-horizontal-#{$i*4px}
22
+ +padding(horizontal, $i*4px)
23
23
 
24
24
  // horizontal-margin-0
25
25
  .is-horizontal-margin-0
@@ -56,26 +56,26 @@ body
56
56
  // こっちに変更
57
57
  body
58
58
  @for $i from 0 through 20
59
- .has-margin-bottom-#{$i*4}
60
- +rem('margin-bottom', #{$i*4}px)
59
+ .has-margin-bottom-#{$i*4px}
60
+ margin-bottom: $i*4px
61
61
  .has-margin-top-#{$i*4}
62
- +rem('margin-top', #{$i*4}px)
62
+ margin-top: $i*4px
63
63
  .has-margin-left-#{$i*4}
64
- +rem('margin-left', #{$i*4}px)
64
+ margin-left: $i*4px
65
65
  .has-margin-right-#{$i*4}
66
- +rem('margin-right', #{$i*4}px)
66
+ margin-right: $i*4px
67
67
  .has-margin-horizontal-#{$i*4}
68
- +margin(horizontal, #{$i*4}px)
69
- .has-padding-bottom-#{$i*4}
70
- +rem('padding-bottom', #{$i*4}px)
71
- .has-padding-top-#{$i*4}
72
- +rem('padding-top', #{$i*4}px)
73
- .has-padding-left-#{$i*4}
74
- +rem('padding-left', #{$i*4}px)
75
- .has-padding-right-#{$i*4}
76
- +rem('padding-right', #{$i*4}px)
77
- .has-padding-horizontal-#{$i*4}
78
- +padding(horizontal, #{$i*4}px)
68
+ +margin(horizontal, $i*4px)
69
+ .has-padding-bottom-#{$i*4px}
70
+ padding-bottom: $i*4px
71
+ .has-padding-top-#{$i*4px}
72
+ padding-top: $i*4px
73
+ .has-padding-left-#{$i*4px}
74
+ padding-left: $i*4px
75
+ .has-padding-right-#{$i*4px}
76
+ padding-right: $i*4px
77
+ .has-padding-horizontal-#{$i*4px}
78
+ +padding(horizontal, $i*4px)
79
79
 
80
80
  // horizontal-margin-0
81
81
  .has-horizontal-margin-0
@@ -1,9 +1,9 @@
1
1
  @for $i from -8 through 8
2
- .is-top-#{$i}
2
+ .is-top-#{$i}px
3
3
  +top(#{$i}px)
4
- .is-bottom-#{$i}
4
+ .is-bottom-#{$i}px
5
5
  +top(#{$i}px)
6
- .is-left-#{$i}
6
+ .is-left-#{$i}px
7
7
  +left(#{$i}px)
8
- .is-right-#{$i}
8
+ .is-right-#{$i}px
9
9
  +right(#{$i}px)
@@ -25,7 +25,7 @@
25
25
  @else
26
26
  $border-width: 0
27
27
  +text-block($font-size $height - ($border-width*2))
28
- +rem('height', $height)
28
+ height: $height
29
29
  +padding(horizontal, $height/1.6)
30
30
  @if $border-radius
31
31
  +border-radius($border-radius)
@@ -34,27 +34,27 @@
34
34
  i,
35
35
  .is-button-icon
36
36
  @if $font-size > 28
37
- +rem('margin-right', $font-size/4)
37
+ margin-right: $font-size/4
38
38
  @else
39
- +rem('margin-right', $font-size/3)
39
+ margin-right: $font-size/3
40
40
  &.has-right-icon
41
41
  i,
42
42
  .is-button-icon
43
43
  margin-right: 0
44
44
  @if $font-size > 28
45
- +rem('margin-left', $font-size/4)
45
+ margin-left: $font-size/4
46
46
  @else
47
- +rem('margin-left', $font-size/3)
47
+ margin-left: $font-size/3
48
48
  &.is-input-container
49
49
  padding: 0
50
50
  position: relative
51
51
  i,
52
52
  .is-button-icon
53
53
  +position(absolute, left $height/2, top 0)
54
- +rem('line-height', $height - ($border-width*2))
54
+ line-height: $height - ($border-width*2)
55
55
  input
56
56
  +padding(horizontal, ($height + if($font-size > 28, $font-size/4, $font-size/3)) $height/2)
57
- +rem('height', $height - ($border-width*2))
57
+ height: $height - ($border-width*2)
58
58
 
59
59
  =button-group
60
60
  .is-button-group
@@ -7,8 +7,8 @@
7
7
  height: auto
8
8
  .is-button-note
9
9
  +inline-block
10
- +rem('font-size', 12px)
11
- +rem('margin-left', 6px)
10
+ font-size: 12px
11
+ margin-left: 6px
12
12
  &.is-disabled,
13
13
  &:disabled
14
14
  pointer-events: none
@@ -6,9 +6,9 @@
6
6
  .waves-ripple
7
7
  position: absolute
8
8
  border-radius: 50%
9
- +block-size(20px)
10
- +rem('margin-top', -10px)
11
- +rem('margin-left', -10px)
9
+ +size(20px)
10
+ margin-top: -10px
11
+ margin-left: -10px
12
12
  opacity: 0
13
13
  @if $color == 'light'
14
14
  background-color: rgba(white, 0.45)
@@ -29,9 +29,6 @@
29
29
  @else
30
30
  background-color: darken($color, 20%)
31
31
  +transition(all 0.7s ease-out)
32
- -webkit-transition-property: -webkit-transform, opacity
33
- -moz-transition-property: -moz-transform, opacity
34
- -o-transition-property: -o-transform, opacity
35
32
  transition-property: transform, opacity
36
33
  +transform(scale(0))
37
34
  pointer-events: none
@@ -42,7 +39,7 @@
42
39
  background-color: $color
43
40
  color: luma_contrast_color($color)
44
41
  box-shadow: 0 2px 5px 0 rgba(black, .16), 0 2px 10px 0 rgba(black, .12)
45
- +rem('letter-spacing', .5px)
42
+ letter-spacing: .5px
46
43
  +waves-effect($color)
47
44
  &:hover,
48
45
  .hover,
@@ -72,7 +69,7 @@
72
69
  +transform(translateZ(0))
73
70
  -webkit-mask-image: -webkit-radial-gradient(circle, white 100%, black 100%)
74
71
  .waves-input-wrapper
75
- border-radius: 0.2em
72
+ border-radius: .2em
76
73
  vertical-align: bottom
77
74
  .waves-button-input
78
75
  +position(relative, 1, top 0, left 0)
@@ -17,13 +17,13 @@ $tabs-nav-current-font-color: red !default
17
17
  +position(absolute, left 0, bottom 0)
18
18
  .tabs-nav__item
19
19
  +inline-block(bottom)
20
- +rem('margin-right', 8px)
20
+ margin-right: 8px
21
21
  &:last-child
22
22
  margin-right: 0
23
23
  .tabs-nav__link
24
24
  +block-link
25
25
  +border(top horizontal, $tabs-nav-border-width solid $tabs-nav-border-color)
26
- +rem('padding-bottom', $tabs-nav-border-width)
26
+ padding-bottom: $tabs-nav-border-width
27
27
  +text-block($tabs-nav-font-size round($tabs-nav-font-size*2.6), center $tabs-nav-font-color)
28
28
  +padding(horizontal, $tabs-nav-font-size*1.6)
29
29
  position: relative
@@ -1,16 +1,16 @@
1
1
  $text-color: $black !default
2
2
 
3
3
  .amazlet-box
4
- +rem('margin-bottom', 32px, !important)
4
+ margin-bottom: 32px !important
5
5
  .amazlet-image
6
6
  float: none !important
7
- +rem('margin', 0 0 16px, !important)
7
+ margin: 0 0 16px !important
8
8
  a[target="_blank"]
9
9
  &:after
10
10
  content: none
11
11
  img
12
12
  max-width: 100%
13
- +rem('width', 260px)
13
+ width: 260px
14
14
  display: block
15
15
  +margin(horizontal, auto)
16
16
  margin-bottom: 0 !important
@@ -21,8 +21,8 @@ $text-color: $black !default
21
21
  text-decoration: none
22
22
  color: $text-color
23
23
  .amazlet-detail
24
- +rem('font-size', 12px)
25
- +rem('margin-bottom', 8px, !important)
24
+ font-size: 12px
25
+ margin-bottom: 8px !important
26
26
  .amazlet-sub-info
27
27
  float: none !important
28
28
  text-align: right
@@ -23,9 +23,9 @@
23
23
  clip: rect(0, 900px, 0, 0)
24
24
  &:after
25
25
  +position(absolute, left 1px, top 0)
26
- +rem('text-shadow', -1px 0 0 rgba(red, 0.4))
26
+ text-shadow: -1px 0 0 rgba(red, 0.4)
27
27
  +animation(noise-anim 2s infinite linear alternate-reverse)
28
28
  &:before
29
29
  +position(absolute, left -1px, top 0)
30
- +rem('text-shadow', 1px 0 0 rgba(blue, 0.4))
30
+ text-shadow: 1px 0 0 rgba(blue, 0.4)
31
31
  +animation(noise-anim-2 3s infinite linear alternate-reverse)
@@ -4,7 +4,7 @@
4
4
  font-family: 'Open Sans', sans-serif
5
5
  font-weight: $fw
6
6
  @if not $ls == 0
7
- +rem('letter-spacing', $ls)
7
+ letter-spacing: $ls
8
8
  @if (not $fs == null)
9
9
  font-style: italic
10
10
  @if $tx-rendering
@@ -0,0 +1,11 @@
1
+ @import url(//fonts.googleapis.com/css?family=Roboto+Mono:400,700,100,100italic,300,300italic,400italic,500,500italic,700italic)
2
+ =roboto-mono($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
3
+ // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
4
+ font-family: 'Roboto Mono', mono
5
+ font-weight: $fw
6
+ @if not $ls == 0
7
+ letter-spacing: $ls
8
+ @if (not $fs == null)
9
+ font-style: italic
10
+ @if $tx-rendering
11
+ text-rendering: optimizelegibility
@@ -1,29 +1,3 @@
1
- /*! sanitize.css v3.0.0 | CC0 1.0 Public Domain | github.com/10up/sanitize.css
2
-
3
- $root-background-color: #FFFFFF !default
4
- $root-box-sizing: border-box !default
5
- $root-color: #000000 !default
6
- $root-cursor: default !default
7
- $root-font-family: sans-serif !default
8
- $root-font-size: 100% !default
9
- $root-line-height: 1.5 !default
10
- $root-text-rendering: optimizeLegibility !default
11
-
12
- $anchor-text-decoration: none !default
13
- $background-repeat: no-repeat !default
14
- $form-element-background-color: transparent !default
15
- $form-element-min-height: if(unitless($root-line-height), #{$root-line-height}em, if(unit($root-line-height) != "%", $root-line-height, null)) !default
16
- $media-element-vertical-align: middle !default
17
- $monospace-font-family: monospace !default
18
- $nav-list-style: none !default
19
- $selection-background-color: #B3D4FC !default
20
- $selection-color: #ffffff !default
21
- $selection-text-shadow: none !default
22
- $small-font-size: 75% !default
23
- $table-border-collapse: collapse !default
24
- $table-border-spacing: 0 !default
25
- $textarea-resize: vertical !default
26
-
27
1
  /*
28
2
  * Normalization
29
3
 
@@ -8,31 +8,31 @@
8
8
  =tail-border-setting($tail-direction, $tail-width, $tail-height)
9
9
  +border(horizontal, if(position_vertical($tail-direction), $tail-width, $tail-height))
10
10
  +border(vertical, if(position_vertical($tail-direction), $tail-height, $tail-width))
11
- +rem($tail-direction, $tail-height*2*-1)
11
+ $tail-direction: $tail-height*2*-1
12
12
 
13
13
  =tail-position-manual($tail-direction: false, $tail-border-color: false, $parent-boder-width: false, $tail-position-manuals: false)
14
14
  @each $key, $value in $tail-position-manuals
15
15
  @if position_vertical($tail-direction) and position_horizontal($key)
16
16
  // 矢印の向きが上下で manual が left or right の場合
17
- +rem($key, $value + if($tail-border-color, $parent-boder-width, 0))
17
+ $key: $value + if($tail-border-color, $parent-boder-width, 0)
18
18
  @else if position_horizontal($tail-direction) and position_vertical($key)
19
19
  // 矢印の向きが左右で manual が top or bottom の場合
20
- +rem($key, $value + if($tail-border-color, $parent-boder-width, 0))
20
+ $key: $value + if($tail-border-color, $parent-boder-width, 0)
21
21
  @else if reverse($tail-direction) == $key
22
22
  // 上向き矢印 で manual が bottom の場合 or 下向き矢印 で manual が top の場合
23
- +rem($key, $value - if($tail-border-color, 0, $parent-boder-width))
23
+ $key: $value - if($tail-border-color, 0, $parent-boder-width)
24
24
 
25
25
  =tail-border-position-manual($tail-direction: false, $tail-position-manuals: false)
26
26
  @each $key, $value in $tail-position-manuals
27
27
  @if position_vertical($tail-direction) and position_horizontal($key)
28
28
  //矢印の向きが上下で manual が left or right の場合
29
- +rem($key, $value)
29
+ $key: $value
30
30
  @else if position_horizontal($tail-direction) and position_vertical($key)
31
31
  // 矢印の向きが左右で manual が top or bottom の場合
32
- +rem($key, $value)
32
+ $key: $value
33
33
  @else if reverse($tail-direction) == $key
34
34
  // 上向き矢印 で manual が bottom の場合 or 下向き矢印 で manual が top の場合
35
- +rem($key, $value)
35
+ $key: $value
36
36
 
37
37
  // +balloon-tail(top red 12px 16px 1px, left 20px, blck)
38
38
  =balloon-tail($tail, $tail-position-manual: false, $tail-border-color: false)
@@ -54,22 +54,22 @@
54
54
  // 矢印の向きが上下
55
55
  +border(vertical, $tail-height)
56
56
  +border(horizontal, $tail-width/2)
57
- +rem($tail-direction, $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width))
57
+ $tail-direction: $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width)
58
58
  @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_vertical($tail-position-manual-direction1))
59
59
  // manual なし、または 一つだけ指定 上下方向 の場合
60
60
  left: 50%
61
- +rem('margin-left', $tail-width/2*-1)
61
+ margin-left: $tail-width/2*-1
62
62
  @if $tail-position-manual
63
63
  +tail-position-manual($tail-direction, $tail-border-color, $parent-boder-width, $tail-position-manuals)
64
64
  @if position_horizontal($tail-direction)
65
65
  // 矢印の向きが左右
66
66
  +border(horizontal, $tail-height)
67
67
  +border(vertical, $tail-width/2)
68
- +rem($tail-direction, $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width))
68
+ $tail-direction: $tail-height*2*-1 - if($tail-border-color, 0, $parent-boder-width)
69
69
  @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_horizontal($tail-position-manual-direction1))
70
70
  // manual なし、または 一つだけ指定 上下方向 の場合
71
71
  top: 50%
72
- +rem('margin-top', ($tail-width/2)*-1)
72
+ margin-top: ($tail-width/2)*-1
73
73
  @if $tail-position-manual
74
74
  +tail-position-manual($tail-direction, $tail-border-color, $parent-boder-width, $tail-position-manuals)
75
75
 
@@ -86,7 +86,7 @@
86
86
  @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_vertical($tail-position-manual-direction1))
87
87
  // manual なし もしくは 一つだけ指定 上下方向 の場合
88
88
  left: 50%
89
- +rem('margin-left', round($tail-width*-1))
89
+ margin-left: round($tail-width*-1)
90
90
  @if $tail-position-manual
91
91
  +tail-border-position-manual($tail-direction, $tail-position-manuals)
92
92
  @if position_horizontal($tail-direction)
@@ -95,6 +95,6 @@
95
95
  @if not $tail-position-manual or (length($tail-position-manual) == 2 and position_horizontal($tail-position-manual-direction1))
96
96
  // manual なし もしくは 一つだけ指定 左右方向 の場合
97
97
  top: 50%
98
- +rem('margin-top', $tail-width*-1)
98
+ margin-top: $tail-width*-1
99
99
  @if $tail-position-manual
100
100
  +tail-border-position-manual($tail-direction, $tail-position-manuals)
@@ -1,39 +1,30 @@
1
- =block-size($values)
2
- @if equal_nth($values, 2)
3
- +rem('width', nth($values, 1))
4
- +rem('height', nth($values, 2))
5
- @else
6
- +rem('width', nth($values, 1))
7
- +rem('height', nth($values, 1))
8
-
9
1
  =center-block($values)
10
2
  $block-width: optional_nth($values, 1)
11
3
  $block-height: optional_nth($values, 2)
12
4
  $block-z-index: optional_nth($values, 3)
13
5
  +block-size($block-width $block-height)
14
- +fixed(left 50%, top 50%, $block-z-index)
15
- +rem('margin-top', $block-height / 2 * -1)
16
- +rem('margin-left', $block-width / 2 * -1)
6
+ +position(fixed, left 50%, top 50%, $block-z-index)
7
+ margin-top: $block-height / 2 * -1
8
+ margin-left: $block-width / 2 * -1
17
9
 
18
10
  =horizontal-center-block($values)
19
11
  $block-width: optional_nth($values, 1)
20
12
  $block-z-index: optional_nth($values, 2)
21
- +rem('width', $block-width)
13
+ width: $block-width
22
14
  +fixed(left 50%, $block-z-index)
23
- +rem('margin-left', $block-width / 2 * -1)
15
+ margin-left: $block-width / 2 * -1
24
16
 
25
17
  =square-block($values)
26
18
  $square-block-size: optional_nth($values, 1)
27
19
  $square-block-height: optional_nth($values, 2)
28
20
  $square-block-line-height: optional_nth($values, 3)
29
- +rem('width', $square-block-size)
30
- +rem('height', if($square-block-height, $square-block-height, $square-block-size))
21
+ +size($square-block-size if($square-block-height, $square-block-height, $square-block-size))
31
22
  @if $square-block-line-height
32
- +rem('line-height', $square-block-line-height)
23
+ line-height: $square-block-line-height
33
24
  @else if $square-block-height
34
- +rem('line-height', $square-block-height)
25
+ line-height: $square-block-height
35
26
  @else
36
- +rem('line-height', $square-block-size)
27
+ line-height: $square-block-size
37
28
 
38
29
  =overflow($values)
39
30
  $overflow-x: optional_nth($values, 1)
@@ -55,7 +46,7 @@
55
46
  +prefixer(background-clip, $value, webkit moz spec)
56
47
 
57
48
  =box-shadow($values...)
58
- +rem(box-shadow, $values)
49
+ box-shadow: $values
59
50
 
60
51
  =text-shadow($values...)
61
- +rem(text-shadow, $values)
52
+ text-shadow: $values
@@ -3,23 +3,23 @@
3
3
 
4
4
  =border-radius($value1: null, $value2: null)
5
5
  @if number(nth($value1, 1))
6
- +rem('border-radius', $value1)
6
+ border-radius: $value1
7
7
  @else
8
8
  @for $i from 1 through length($value1)
9
9
  @if nth($value1, $i) == 'all'
10
- +rem('border-radius', $value2)
10
+ border-radius: $value2
11
11
  @else if top(nth($value1, $i))
12
- +rem('border-top-left-radius', $value2)
13
- +rem('border-top-right-radius', $value2)
12
+ border-top-left-radius: $value2
13
+ border-top-right-radius: $value2
14
14
  @else if bottom(nth($value1, $i))
15
- +rem('border-bottom-left-radius', $value2)
16
- +rem('border-bottom-right-radius', $value2)
15
+ border-bottom-left-radius: $value2
16
+ border-bottom-right-radius: $value2
17
17
  @else if left(nth($value1, $i))
18
- +rem('border-top-left-radius', $value2)
19
- +rem('border-bottom-left-radius', $value2)
18
+ border-top-left-radius: $value2
19
+ border-bottom-left-radius: $value2
20
20
  @else if right(nth($value1, $i))
21
- +rem('border-top-right-radius', $value2)
22
- +rem('border-bottom-right-radius', $value2)
21
+ border-top-right-radius: $value2
22
+ border-bottom-right-radius: $value2
23
23
 
24
24
  // 使い方
25
25
  // +reset-border-radius(vertical, 4px)
@@ -2,7 +2,7 @@
2
2
  #{if($border-position, border-#{$border-position}, border)}:
3
3
  @for $i from 1 through length($border-values)
4
4
  @if border-width(nth($border-values, $i))
5
- +rem('width', nth($border-values, $i))
5
+ width: nth($border-values, $i)
6
6
  @else if border-style(nth($border-values, $i))
7
7
  style: nth($border-values, $i)
8
8
  @else if border-color(nth($border-values, $i))
@@ -9,26 +9,7 @@
9
9
 
10
10
  .container
11
11
  +container-fixed
12
-
13
- @media (min-width: $screen-sm-min)
14
- width: $container-sm
15
-
16
- @media (min-width: $screen-md-min)
17
- width: $container-md
18
-
19
- @media (min-width: $screen-lg-min)
20
- width: $container-lg
21
-
22
-
23
-
24
- // Fluid container
25
- //
26
- // Utilizes the mixin meant for fixed width containers, but without any defined
27
- // width for fluid, full width layouts.
28
-
29
- .container-fluid
30
- +container-fixed
31
-
12
+ max-width: $container-max-width
32
13
 
33
14
  // Row
34
15
  //
@@ -14,7 +14,7 @@
14
14
  +background-image(linear-gradient(left, color-stops(nth($stripe-color, 1), nth($stripe-color, 1) (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%)))
15
15
  background-color: nth($stripe-color, 2)
16
16
  +background-size(($stripe-width + $gatter-width) ($stripe-width + $gatter-width))
17
- +rem('height', $size)
17
+ height: $size
18
18
 
19
19
  // http://codepen.io/anon/pen/tGhLp を改造
20
20
  =striped-line($stripe-color: #000000, $size: 20px)
@@ -29,4 +29,4 @@
29
29
  +background-image(linear-gradient(-45deg, nth($stripe-color, 1) 25%, transparent 25%, transparent 50%, nth($stripe-color, 1) 50%, nth($stripe-color, 1) 75%, transparent 75%, transparent))
30
30
  background-color: nth($stripe-color, 2)
31
31
  +background-size($size $size)
32
- +rem('height', $size)
32
+ height: $size
@@ -1,15 +1,15 @@
1
1
  // +list(12px 24px, fa '\f192', 12px 3px 8px)
2
2
  // +list(margin-left margin-bottom, fa '\f192', icon-size top left)
3
3
  =list($margins: null, $list-style: null, $icon-position: null)
4
- +rem('margin-left', optional_nth($margins, 1))
5
- +rem('margin-bottom', optional_nth($margins, 2))
4
+ margin-left: optional_nth($margins, 1)
5
+ margin-bottom: optional_nth($margins, 2)
6
6
  @for $i from 1 through length($list-style)
7
7
  @if nth($list-style, $i) == "fa"
8
8
  list-style-type: none
9
9
  >li
10
10
  position: relative
11
11
  display: block
12
- +rem('padding-left', optional_nth($icon-position, 1) + optional_nth($icon-position, 3))
12
+ padding-left: optional_nth($icon-position, 1) + optional_nth($icon-position, 3)
13
13
  &:before
14
14
  +fa(optional_nth($list-style, $i + 1))
15
15
  +text-block(optional_nth($icon-position, 1) optional_nth($icon-position, 1))
@@ -1,69 +1,69 @@
1
1
  =margin($value1, $value2: null)
2
2
  @if number(nth($value1, 1)) or nth($value1, 1) == 'auto'
3
3
  @if equal_nth($value1, 1)
4
- +rem('margin', $value1)
4
+ margin: value1
5
5
  @else if equal_nth($value1, 2)
6
- +rem('margin-top', nth($value1, 1))
7
- +rem('margin-bottom', nth($value1, 2))
6
+ margin-top: nth($value1, 1)
7
+ margin-bottom: nth($value1, 2)
8
8
  @else if equal_nth($value1, 3)
9
- +rem('margin-top', nth($value1, 1))
10
- +rem('margin-bottom', nth($value1, 3))
9
+ margin-top: nth($value1, 1)
10
+ margin-bottom: nth($value1, 3)
11
11
  +margin(horizontal, nth($value1, 2))
12
12
  @else if equal_nth($value1, 4)
13
- +rem('margin-top', nth($value1, 1))
14
- +rem('margin-right', nth($value1, 2))
15
- +rem('margin-bottom', nth($value1, 3))
16
- +rem('margin-left', nth($value1, 4))
13
+ margin-top: nth($value1, 1)
14
+ margin-right: nth($value1, 2)
15
+ margin-bottom: nth($value1, 3)
16
+ margin-left: nth($value1, 4)
17
17
  @else if length($value1) == 1 and nth($value1, 1) == 'vertical'
18
- +rem('margin-top', if(list($value2), nth($value2, 1), $value2))
19
- +rem('margin-bottom', if(list($value2),nth($value2, 2), $value2))
18
+ margin-top: if(list($value2), nth($value2, 1), $value2)
19
+ margin-bottom: if(list($value2),nth($value2, 2), $value2)
20
20
  @else if length($value1) == 1 and nth($value1, 1) == 'horizontal'
21
- +rem('margin-left', if(list($value2), nth($value2, 1), $value2))
22
- +rem('margin-right', if(list($value2),nth($value2, 2), $value2))
21
+ margin-left: if(list($value2), nth($value2, 1), $value2)
22
+ margin-right: if(list($value2),nth($value2, 2), $value2)
23
23
  @else
24
24
  @each $position in $value1
25
25
  @if $position == 'all'
26
- +rem('margin', $value2)
26
+ margin: $value2
27
27
  @else if $position == 'vertical'
28
- +rem('margin-top', $value2)
29
- +rem('margin-bottom', $value2)
28
+ margin-top: $value2
29
+ margin-bottom: $value2
30
30
  @else if $position == 'horizontal'
31
- +rem('margin-left', $value2)
32
- +rem('margin-right', $value2)
31
+ margin-left: $value2
32
+ margin-right: $value2
33
33
  @else
34
- +rem('margin-#{$position}', $value2)
34
+ margin-#{$position}: $value2
35
35
 
36
36
  =padding($value1: null, $value2: null)
37
37
  @if number(nth($value1, 1)) or nth($value1, 1) == 'auto'
38
38
  @if equal_nth($value1, 1)
39
- +rem('padding', $value1)
39
+ padding: $value1
40
40
  @else if equal_nth($value1, 2)
41
- +rem('padding-top', nth($value1, 1))
42
- +rem('padding-bottom', nth($value1, 2))
41
+ padding-top: nth($value1, 1)
42
+ padding-bottom: nth($value1, 2)
43
43
  @else if equal_nth($value1, 3)
44
- +rem('padding-top', nth($value1, 1))
45
- +rem('padding-bottom', nth($value1, 3))
44
+ padding-top: nth($value1, 1)
45
+ padding-bottom: nth($value1, 3)
46
46
  +padding(horizontal, nth($value1, 2))
47
47
  @else if equal_nth($value1, 4)
48
- +rem('padding-top', nth($value1, 1))
49
- +rem('padding-right', nth($value1, 2))
50
- +rem('padding-bottom', nth($value1, 3))
51
- +rem('padding-left', nth($value1, 4))
48
+ padding-top: nth($value1, 1)
49
+ padding-right: nth($value1, 2)
50
+ padding-bottom: nth($value1, 3)
51
+ padding-left: nth($value1, 4)
52
52
  @else if length($value1) == 1 and nth($value1, 1) == 'vertical'
53
- +rem('padding-top', if(list($value2), nth($value2, 1), $value2))
54
- +rem('padding-bottom', if(list($value2),nth($value2, 2), $value2))
53
+ padding-top: if(list($value2), nth($value2, 1), $value2)
54
+ padding-bottom: if(list($value2),nth($value2, 2), $value2)
55
55
  @else if length($value1) == 1 and nth($value1, 1) == 'horizontal'
56
- +rem('padding-left', if(list($value2), nth($value2, 1), $value2))
57
- +rem('padding-right', if(list($value2),nth($value2, 2), $value2))
56
+ padding-left: if(list($value2), nth($value2, 1), $value2)
57
+ padding-right: if(list($value2),nth($value2, 2), $value2)
58
58
  @else
59
59
  @each $position in $value1
60
60
  @if $position == 'all'
61
- +rem('padding', $value2)
61
+ padding: $value2
62
62
  @else if $position == 'vertical'
63
- +rem('padding-top', $value2)
64
- +rem('padding-bottom', $value2)
63
+ padding-top: $value2
64
+ padding-bottom: $value2
65
65
  @else if $position == 'horizontal'
66
- +rem('padding-left', $value2)
67
- +rem('padding-right', $value2)
66
+ padding-left: $value2
67
+ padding-right: $value2
68
68
  @else
69
- +rem('padding-#{$position}', $value2)
69
+ padding-#{$position}: $value2
@@ -2,7 +2,7 @@
2
2
  $values: $value1 $value2 $value3 $value4 $value5 $value6
3
3
  @each $value in $values
4
4
  @if optional_nth($value, 2)
5
- +rem(nth($value, 1), nth($value, 2))
5
+ #{nth($value, 1)}: nth($value, 2)
6
6
  @else if unitless_number($value)
7
7
  z-index: nth($value, 1)
8
8
  @else
@@ -5,52 +5,36 @@
5
5
  // original https://github.com/bitmanic/rem
6
6
  // customize by machida
7
7
 
8
- $baseline-px: 10px !default
9
-
10
- =base-font-size
11
- font-size: $baseline-px
12
- font-size: strip_unit($baseline-px / 10) * 1rem
8
+ $baseline-px: $root-font-size !default
13
9
 
14
10
  =rem($property, $px-values, $important: null)
15
- @if $rem == true and (px($px-values) or list($px-values))
16
- @if $property == "font-size" and $px-values < 10px
17
- // 9px以下のfont-sizeを使う設定(IE8不可)
18
- +base-font-size
19
- +transform(scale3d(strip_unit($px-values / strip_unit($baseline-px)), strip_unit($px-values/ strip_unit($baseline-px)), 1))
20
- +transform-origin(0 0)
11
+ // Convert the baseline into rems
12
+ $baseline-rem: $baseline-px / 1rem
13
+ // remが使えないブラウザ用にpx版を出力
14
+ @if $important
15
+ #{$property}: $px-values !important
16
+ @else
17
+ #{$property}: $px-values
18
+ // remで出力
19
+ @if px($px-values) and $px-values >= 1
20
+ @if $important
21
+ #{$property}: $px-values / $baseline-rem !important
21
22
  @else
22
- // Convert the baseline into rems
23
- $baseline-rem: $baseline-px / 1rem
24
- // remが使えないブラウザ用にpx版を出力
25
- @if $important
26
- #{$property}: $px-values !important
27
- @else
28
- #{$property}: $px-values
29
- // remで出力
30
- @if px($px-values) and $px-values >= 1
31
- @if $important
32
- #{$property}: $px-values / $baseline-rem !important
23
+ #{$property}: $px-values / $baseline-rem
24
+ @else
25
+ // Create an empty list that we can dump values into
26
+ $rem-values: ()
27
+ @each $value in $px-values
28
+ @if px($value)
29
+ // If the value is zero or not a number, return it
30
+ @if strip_unit($value) == 0 or type-of( $value ) != "number"
31
+ $rem-values: append($rem-values, $value)
33
32
  @else
34
- #{$property}: $px-values / $baseline-rem
33
+ $rem-values: append($rem-values, $value / $baseline-rem)
35
34
  @else
36
- // Create an empty list that we can dump values into
37
- $rem-values: ()
38
- @each $value in $px-values
39
- @if px($value)
40
- // If the value is zero or not a number, return it
41
- @if strip_unit($value) == 0 or type-of( $value ) != "number"
42
- $rem-values: append($rem-values, $value)
43
- @else
44
- $rem-values: append($rem-values, $value / $baseline-rem)
45
- @else
46
- $rem-values: append($rem-values, $value)
47
- // Return the property and its list of converted values
48
- @if $important
49
- #{$property}: $rem-values !important
50
- @else
51
- #{$property}: $rem-values
52
- @else
35
+ $rem-values: append($rem-values, $value)
36
+ // Return the property and its list of converted values
53
37
  @if $important
54
- #{$property}: $px-values !important
38
+ #{$property}: $rem-values !important
55
39
  @else
56
- #{$property}: $px-values
40
+ #{$property}: $rem-values
@@ -1,7 +1,7 @@
1
1
  =table-cell-assign($value)
2
2
  @if list($value)
3
3
  @if unit_number(nth($value, 1))
4
- +rem('padding', $value)
4
+ padding: $value
5
5
  @if direction(nth($value, 1))
6
6
  +padding(nth($value, 1), nth($value, 2))
7
7
  white-space: if(white_space($value), $value, null)
@@ -10,16 +10,16 @@
10
10
 
11
11
  // +text-block($font-size $line-height $margin-bottom, $font-weight $text-align $color $top)
12
12
  =text-block($value1: null, $value2: null)
13
- +rem('font-size', nth($value1, 1))
14
- +rem('line-height', optional_nth($value1, 2))
15
- +rem('margin-bottom', optional_nth($value1, 3))
13
+ font-size: nth($value1, 1)
14
+ line-height: optional_nth($value1, 2)
15
+ margin-bottom: optional_nth($value1, 3)
16
16
  @if ($value2)
17
17
  @for $i from 1 through length($value2)
18
18
  +text-block-options(nth($value2, $i))
19
19
 
20
20
  =letter-spacing-center($space-width: null)
21
- +rem('letter-spacing', $space-width)
22
- +rem('text-indent', $space-width)
21
+ letter-spacing: $space-width
22
+ text-indent: $space-width
23
23
 
24
24
  // brをアクティブにするサイズを設定
25
25
  =br($active-sizes)
@@ -42,3 +42,8 @@
42
42
  @else if nth($value1, $i) == xl
43
43
  +screen-md
44
44
  display: block
45
+
46
+ =small-font($font-size)
47
+ // 9px以下のfont-sizeを使う設定(IE8不可)
48
+ +transform(scale3d(strip_unit($font-size / 10), strip_unit($font-size/ 10), 1))
49
+ +transform-origin(0 0)
@@ -4,12 +4,6 @@
4
4
 
5
5
  $pi: 3.14159265359
6
6
 
7
- /////////////////
8
- // rem
9
- ////////////////
10
-
11
- $rem: false !default
12
-
13
7
  /////////////////
14
8
  // positions
15
9
  ////////////////
@@ -26,15 +20,6 @@ $container-class-name: container !default
26
20
  $container-max-width: 1100px !default
27
21
  $container-horizontal-padding: 16px !default
28
22
 
29
- /////////////////
30
- // selection
31
- ////////////////
32
-
33
- $selection-bg-color: black !default
34
- $selection-tx-color: white !default
35
- $input-selection-bg-color: lightgray !default
36
- $input-selection-tx-color: black !default
37
-
38
23
  /////////////////
39
24
  // text-color
40
25
  ////////////////
@@ -136,8 +121,12 @@ $info: #5BC0DE !default
136
121
  $warning: #F0AD4E !default
137
122
  $danger: #D9534F !default
138
123
 
139
- $text-color: #333333 !default
140
- $default-text-reversal: #ffffff !default
124
+ /////////////////
125
+ // text colors
126
+ ////////////////
127
+
128
+ $default-text: black !default
129
+ $reversal-text: white !default
141
130
 
142
131
  /////////////////
143
132
  // SNS colors
@@ -148,9 +137,34 @@ $facebook: #3b5998
148
137
  $hatena: #008FDE
149
138
  $pocket: #f23c53
150
139
 
151
- $default-text: black !default
152
- $reversal-text: white !default
153
-
154
140
  // luma contrast color
155
141
  $luma-contrast-bright-color: $default-text !global
156
142
  $luma-contrast-dark-color: $reversal-text !global
143
+
144
+ /////////////////
145
+ // sanitize.css
146
+ ////////////////
147
+
148
+ $root-background-color: #FFFFFF !default
149
+ $root-box-sizing: border-box !default
150
+ $root-color: #000000 !default
151
+ $root-cursor: default !default
152
+ $root-font-family: $basic-sans-serif !default
153
+ $root-font-size: 100% !default
154
+ $root-line-height: 1.5 !default
155
+ $root-text-rendering: optimizeLegibility !default
156
+
157
+ $anchor-text-decoration: none !default
158
+ $background-repeat: no-repeat !default
159
+ $form-element-background-color: transparent !default
160
+ $form-element-min-height: if(unitless($root-line-height), #{$root-line-height}em, if(unit($root-line-height) != "%", $root-line-height, null)) !default
161
+ $media-element-vertical-align: middle !default
162
+ $monospace-font-family: $basic-mono !default
163
+ $nav-list-style: none !default
164
+ $selection-background-color: #B3D4FC !default
165
+ $selection-color: #ffffff !default
166
+ $selection-text-shadow: none !default
167
+ $small-font-size: 75% !default
168
+ $table-border-collapse: collapse !default
169
+ $table-border-spacing: 0 !default
170
+ $textarea-resize: vertical !default
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.9.4",
3
+ "version": "0.9.5",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
data/lib/oulu/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oulu
2
- VERSION = "0.9.4"
2
+ VERSION = "0.9.5"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.9.4",
3
+ "version": "0.9.5",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oulu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.4
4
+ version: 0.9.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-15 00:00:00.000000000 Z
11
+ date: 2016-02-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -110,6 +110,7 @@ files:
110
110
  - app/assets/stylesheets/options/web-fonts/_pt-sans.sass
111
111
  - app/assets/stylesheets/options/web-fonts/_raleway.sass
112
112
  - app/assets/stylesheets/options/web-fonts/_roboto-condensed.sass
113
+ - app/assets/stylesheets/options/web-fonts/_roboto-mono.sass
113
114
  - app/assets/stylesheets/options/web-fonts/_roboto.sass
114
115
  - app/assets/stylesheets/options/web-fonts/_satisfy.sass
115
116
  - app/assets/stylesheets/options/web-fonts/_source-code-pro.sass