oulu-rails 0.5.9 → 0.5.10

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5794f3a8b21a31dc083f1238d17198c6b4180ac3
4
- data.tar.gz: da59d3199013343d34ec4e9312775a19674b99ee
3
+ metadata.gz: 22696fcf33394f219c7cc8c1390a75b81c1e1471
4
+ data.tar.gz: 816c963e2d5caa6f013e4805d7782f2dba6c5287
5
5
  SHA512:
6
- metadata.gz: 9897d1022caa69cef853cb795d0aeb53d55880628238cb8fad14d5152166b37449797a3e57ff1e801444a8ed11737992f695f329cabacdba7cdaffb50bcfbd6f
7
- data.tar.gz: a37809e777d5ebcb248962efd1c61b63a80f327c839032035ab93c0ca15c3de0e321b7565fdee5512c56c94d8b5ef91afe793a28e4a65dac2ff96fafcf8f7e81
6
+ metadata.gz: 844ba0a9206649f78c3f0d47ad0993dafc70e9d8fea67fafbfee99dc255cf301a15dd73e7f1082b3b9b40e66a24f14a551f89e309d6b5107a8b7b394a4cbe823
7
+ data.tar.gz: d3774499d458624df5b3c494b84c2bf571083cd704c1a87bf5d1593dc8cc8ee97b067597b6e70d855d90be43d3f521e30fd275f6daad6c0f530ae4d3f66c1106
@@ -1,3 +1,3 @@
1
1
  module OuluRails
2
- VERSION = "0.5.9"
2
+ VERSION = "0.5.10"
3
3
  end
@@ -32,15 +32,14 @@
32
32
 
33
33
  // functions
34
34
  ///////////////////
35
+ @import settings/functions/list
35
36
  @import settings/functions/number
36
37
  @import settings/functions/string
37
38
  @import settings/functions/length
38
- @import settings/functions/list
39
39
  @import settings/functions/map
40
40
  @import settings/functions/bool
41
41
  @import settings/functions/position
42
42
  @import settings/functions/text
43
- @import settings/functions/direction
44
43
  @import settings/functions/reverse
45
44
  @import settings/functions/color
46
45
  @import settings/functions/image
@@ -6,3 +6,12 @@
6
6
  line-height: 1
7
7
  -webkit-font-smoothing: antialiased
8
8
  -moz-osx-font-smoothing: grayscale
9
+
10
+ =fa-icon($icon: '\f105', $size: 16px 12px, $options: null, $position1:null, $position2: null)
11
+ &:before
12
+ +fa
13
+ content: "#{$icon}"
14
+ @if $position1
15
+ +absolute(if($position1, $position1, null), if($position2, $position2, null))
16
+ @if $size
17
+ +text-block($size, $options)
@@ -0,0 +1,12 @@
1
+ @import url(//fonts.googleapis.com/css?family=Roboto+Condensed:300italic,400italic,700italic,400,700,300)
2
+ =roboto-condensed($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
3
+ // 300 400 700
4
+ // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
+ font-family: 'Roboto Condensed', sans-serif
6
+ font-weight: $fw
7
+ @if not $ls == 0
8
+ letter-spacing: $ls
9
+ @if (not $fs == null)
10
+ font-style: italic
11
+ @if $tx-rendering
12
+ text-rendering: optimizelegibility
@@ -1,4 +1,4 @@
1
- @import url(http://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900)
1
+ @import url(//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900)
2
2
  =roboto($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
3
3
  // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
4
4
  font-family: 'Roboto', sans-serif
@@ -47,7 +47,7 @@
47
47
  @else
48
48
  @return null
49
49
 
50
- @function background-image($value)
50
+ @function background_image($value)
51
51
  @if image($value)
52
52
  @return true
53
53
  @else
@@ -1,5 +1,5 @@
1
1
  @function border_color($value)
2
- @if color($value)
2
+ @if optional_color_list($value)
3
3
  @return true
4
4
  @else
5
5
  @return null
@@ -7,41 +7,39 @@
7
7
  @function border_width($value)
8
8
  @if number($value)
9
9
  @return true
10
+ @else if $value == 'thin' or $value == 'medium' or $value == 'thick'
11
+ @return true
12
+ @else if list($value)
13
+ @each $assign in $value
14
+ @if $assign == 'thin' or $assign == 'medium' or $assign == 'thick'
15
+ @return true
16
+ @else if number($assign)
17
+ @return true
18
+ @else
19
+ @return null
10
20
  @else
11
21
  @return null
12
22
 
13
23
  @function border_style($value)
14
24
  @if $value == 'none' or $value == 'hidden' or $value == 'solid' or $value == 'double' or $value == 'groove' or $value == 'ridge' or $value == 'inset' or $value == 'outset' or $value == 'dashed' or $value == 'dotted'
15
25
  @return true
26
+ @else if list($value)
27
+ @each $assign in $value
28
+ @if $value == 'none' or $value == 'hidden' or $value == 'solid' or $value == 'double' or $value == 'groove' or $value == 'ridge' or $value == 'inset' or $value == 'outset' or $value == 'dashed' or $value == 'dotted'
29
+ @return true
30
+ @else
31
+ @return null
16
32
  @else
17
33
  @return null
18
34
 
19
35
  @function border_position($value)
20
36
  @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right" or $value == "all" or $value == "horizontal" or $value == "vertical"
21
37
  @return true
22
- @else
23
- @return null
24
-
25
- @function all($value)
26
- @if $value == "all"
27
- @return true
28
- @else
29
- @return null
30
-
31
- @function horizontal($value)
32
- @if $value == "horizontal"
33
- @return true
34
- @else
35
- @return null
36
-
37
- @function vertical($value)
38
- @if $value == "vertical"
39
- @return true
40
- @else
41
- @return null
42
-
43
- @function four_direction($value)
44
- @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right"
45
- @return true
38
+ @else if list($value)
39
+ @each $assign in $value
40
+ @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right" or $value == "all" or $value == "horizontal" or $value == "vertical"
41
+ @return true
42
+ @else
43
+ @return null
46
44
  @else
47
45
  @return null
@@ -4,6 +4,24 @@
4
4
  @else
5
5
  @return null
6
6
 
7
+ @function color_list($values)
8
+ @if list($values)
9
+ @each $value in $values
10
+ @if color($value)
11
+ @return true
12
+ @else
13
+ @return null
14
+ @else
15
+ @return null
16
+
17
+ @function optional_color_list($values)
18
+ @if color($values)
19
+ @return true
20
+ @else if color_list($values)
21
+ @return true
22
+ @else
23
+ @return null
24
+
7
25
  @function luma($color)
8
26
  // Adapted from: https://gist.github.com/voxpelli/6304812
9
27
  $rgba: red($color), green($color), blue($color)
@@ -4,6 +4,24 @@
4
4
  @else
5
5
  @return null
6
6
 
7
+ @function number_list($values)
8
+ @if list($values)
9
+ @each $value in $values
10
+ @if number($value)
11
+ @return true
12
+ @else
13
+ @return null
14
+ @else
15
+ @return null
16
+
17
+ @function optional_number_list($values)
18
+ @if type-of($values) == number
19
+ @return true
20
+ @else if number_list($values)
21
+ @return true
22
+ @else
23
+ @return null
24
+
7
25
  @function odd($number)
8
26
  @if ceil($number/2) != $number/2
9
27
  @return true
@@ -4,6 +4,21 @@
4
4
  @else
5
5
  @return null
6
6
 
7
+ @function direction($value)
8
+ @if string($value)
9
+ @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right" or $value == "horizontal" or $value == "vertical" or $value == "all"
10
+ @return true
11
+ @else
12
+ @return null
13
+ @else
14
+ @return null
15
+
16
+ @function four_position($value)
17
+ @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right"
18
+ @return true
19
+ @else
20
+ @return null
21
+
7
22
  @function top($value)
8
23
  @if $value == "top"
9
24
  @return true
@@ -45,3 +60,21 @@
45
60
  @return true
46
61
  @else
47
62
  @return null
63
+
64
+ @function all($value)
65
+ @if $value == "all"
66
+ @return true
67
+ @else
68
+ @return null
69
+
70
+ @function horizontal($value)
71
+ @if $value == "horizontal"
72
+ @return true
73
+ @else
74
+ @return null
75
+
76
+ @function vertical($value)
77
+ @if $value == "vertical"
78
+ @return true
79
+ @else
80
+ @return null
@@ -16,7 +16,7 @@
16
16
  =background-basics($value)
17
17
  @if background_color($value)
18
18
  background-color: $value
19
- @else if background-image($value)
19
+ @else if background_image($value)
20
20
  background-image: image_url("#{$value}")
21
21
  @else if background_position($value)
22
22
  background-position: $value
@@ -22,7 +22,7 @@
22
22
  $border-positions: $horizontal
23
23
  @each $border-position in $border-positions
24
24
  +assign-border-position($border-position, $value2)
25
- @else if four_direction(nth($value1, $i))
25
+ @else if four_positions(nth($value1, $i))
26
26
  $border-positions: nth($value1, $i)
27
27
  @each $border-position in $border-positions
28
28
  +assign-border-position($border-position, $value2)
@@ -37,7 +37,7 @@ $baseline-px: 10px
37
37
  $rem-values: ()
38
38
  @each $value in $px-values
39
39
  // If the value is zero or not a number, return it
40
- @if $value == 0 or type-of( $value ) != "number"
40
+ @if strip_unit($value) == 0 or type-of( $value ) != "number"
41
41
  $rem-values: append($rem-values, $value)
42
42
  @else
43
43
  $rem-values: append($rem-values, $value / $baseline-rem)
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oulu-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.9
4
+ version: 0.5.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-12 00:00:00.000000000 Z
11
+ date: 2014-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass-rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 5.0.0.beta1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 5.0.0.beta1
27
27
  - !ruby/object:Gem::Dependency
@@ -29,6 +29,9 @@ dependencies:
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '2.0'
34
+ - - ">="
32
35
  - !ruby/object:Gem::Version
33
36
  version: 2.0.0
34
37
  type: :runtime
@@ -36,106 +39,151 @@ dependencies:
36
39
  version_requirements: !ruby/object:Gem::Requirement
37
40
  requirements:
38
41
  - - "~>"
42
+ - !ruby/object:Gem::Version
43
+ version: '2.0'
44
+ - - ">="
39
45
  - !ruby/object:Gem::Version
40
46
  version: 2.0.0
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: compass-rgbapng
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
51
+ - - "~>"
52
+ - !ruby/object:Gem::Version
53
+ version: '0.2'
45
54
  - - ">="
46
55
  - !ruby/object:Gem::Version
47
- version: '0'
56
+ version: 0.2.0
48
57
  type: :runtime
49
58
  prerelease: false
50
59
  version_requirements: !ruby/object:Gem::Requirement
51
60
  requirements:
61
+ - - "~>"
62
+ - !ruby/object:Gem::Version
63
+ version: '0.2'
52
64
  - - ">="
53
65
  - !ruby/object:Gem::Version
54
- version: '0'
66
+ version: 0.2.0
55
67
  - !ruby/object:Gem::Dependency
56
68
  name: modular-scale
57
69
  requirement: !ruby/object:Gem::Requirement
58
70
  requirements:
71
+ - - "~>"
72
+ - !ruby/object:Gem::Version
73
+ version: '2.0'
59
74
  - - ">="
60
75
  - !ruby/object:Gem::Version
61
- version: '0'
76
+ version: 2.0.0
62
77
  type: :runtime
63
78
  prerelease: false
64
79
  version_requirements: !ruby/object:Gem::Requirement
65
80
  requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '2.0'
66
84
  - - ">="
67
85
  - !ruby/object:Gem::Version
68
- version: '0'
86
+ version: 2.0.0
69
87
  - !ruby/object:Gem::Dependency
70
88
  name: oily_png
71
89
  requirement: !ruby/object:Gem::Requirement
72
90
  requirements:
91
+ - - "~>"
92
+ - !ruby/object:Gem::Version
93
+ version: '1.1'
73
94
  - - ">="
74
95
  - !ruby/object:Gem::Version
75
- version: '0'
96
+ version: 1.1.0
76
97
  type: :runtime
77
98
  prerelease: false
78
99
  version_requirements: !ruby/object:Gem::Requirement
79
100
  requirements:
101
+ - - "~>"
102
+ - !ruby/object:Gem::Version
103
+ version: '1.1'
80
104
  - - ">="
81
105
  - !ruby/object:Gem::Version
82
- version: '0'
106
+ version: 1.1.0
83
107
  - !ruby/object:Gem::Dependency
84
108
  name: ceaser-easing
85
109
  requirement: !ruby/object:Gem::Requirement
86
110
  requirements:
111
+ - - "~>"
112
+ - !ruby/object:Gem::Version
113
+ version: '0.7'
87
114
  - - ">="
88
115
  - !ruby/object:Gem::Version
89
- version: '0'
116
+ version: 0.7.0
90
117
  type: :runtime
91
118
  prerelease: false
92
119
  version_requirements: !ruby/object:Gem::Requirement
93
120
  requirements:
121
+ - - "~>"
122
+ - !ruby/object:Gem::Version
123
+ version: '0.7'
94
124
  - - ">="
95
125
  - !ruby/object:Gem::Version
96
- version: '0'
126
+ version: 0.7.0
97
127
  - !ruby/object:Gem::Dependency
98
128
  name: SassyLists
99
129
  requirement: !ruby/object:Gem::Requirement
100
130
  requirements:
131
+ - - "~>"
132
+ - !ruby/object:Gem::Version
133
+ version: '2.2'
101
134
  - - ">="
102
135
  - !ruby/object:Gem::Version
103
- version: '0'
136
+ version: 2.2.0
104
137
  type: :runtime
105
138
  prerelease: false
106
139
  version_requirements: !ruby/object:Gem::Requirement
107
140
  requirements:
141
+ - - "~>"
142
+ - !ruby/object:Gem::Version
143
+ version: '2.2'
108
144
  - - ">="
109
145
  - !ruby/object:Gem::Version
110
- version: '0'
146
+ version: 2.2.0
111
147
  - !ruby/object:Gem::Dependency
112
148
  name: toolkit
113
149
  requirement: !ruby/object:Gem::Requirement
114
150
  requirements:
151
+ - - "~>"
152
+ - !ruby/object:Gem::Version
153
+ version: '2.5'
115
154
  - - ">="
116
155
  - !ruby/object:Gem::Version
117
- version: '0'
156
+ version: 2.5.0
118
157
  type: :runtime
119
158
  prerelease: false
120
159
  version_requirements: !ruby/object:Gem::Requirement
121
160
  requirements:
161
+ - - "~>"
162
+ - !ruby/object:Gem::Version
163
+ version: '2.5'
122
164
  - - ">="
123
165
  - !ruby/object:Gem::Version
124
- version: '0'
166
+ version: 2.5.0
125
167
  - !ruby/object:Gem::Dependency
126
168
  name: sassy-maps
127
169
  requirement: !ruby/object:Gem::Requirement
128
170
  requirements:
171
+ - - "~>"
172
+ - !ruby/object:Gem::Version
173
+ version: '0.4'
129
174
  - - ">="
130
175
  - !ruby/object:Gem::Version
131
- version: '0'
176
+ version: 0.4.0
132
177
  type: :runtime
133
178
  prerelease: false
134
179
  version_requirements: !ruby/object:Gem::Requirement
135
180
  requirements:
181
+ - - "~>"
182
+ - !ruby/object:Gem::Version
183
+ version: '0.4'
136
184
  - - ">="
137
185
  - !ruby/object:Gem::Version
138
- version: '0'
186
+ version: 0.4.0
139
187
  description: A mixin library for Sass.
140
188
  email:
141
189
  - machida@fjord.jp
@@ -283,6 +331,7 @@ files:
283
331
  - vendor/assets/stylesheets/options/web-fonts/_open-sans.css.sass
284
332
  - vendor/assets/stylesheets/options/web-fonts/_podkova.css.sass
285
333
  - vendor/assets/stylesheets/options/web-fonts/_pt-sans.css.sass
334
+ - vendor/assets/stylesheets/options/web-fonts/_roboto-condensed.css.sass
286
335
  - vendor/assets/stylesheets/options/web-fonts/_roboto.css.sass
287
336
  - vendor/assets/stylesheets/options/web-fonts/_satisfy.css.sass
288
337
  - vendor/assets/stylesheets/options/web-fonts/_source-code-pro.css.sass
@@ -296,7 +345,6 @@ files:
296
345
  - vendor/assets/stylesheets/settings/functions/_color.css.sass
297
346
  - vendor/assets/stylesheets/settings/functions/_content.css.sass
298
347
  - vendor/assets/stylesheets/settings/functions/_cursor.css.sass
299
- - vendor/assets/stylesheets/settings/functions/_direction.css.sass
300
348
  - vendor/assets/stylesheets/settings/functions/_image.css.sass
301
349
  - vendor/assets/stylesheets/settings/functions/_length.css.sass
302
350
  - vendor/assets/stylesheets/settings/functions/_list.css.sass
@@ -1,8 +0,0 @@
1
- @function direction($value)
2
- @if string($value)
3
- @if $value == "top" or $value == "bottom" or $value == "left" or $value == "right" or $value == "horizontal" or $value == "vertical"
4
- @return true
5
- @else
6
- @return null
7
- @else
8
- @return null