oulu 0.12.26 → 0.12.27

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3444712f2fef989f1af7ad65d6a7659cfce5b0bc
4
- data.tar.gz: b859d798757245d79f4973d0baf25cbe2e4bfa0d
3
+ metadata.gz: 435328fcbc6585178506673bfb7682e4be7ced75
4
+ data.tar.gz: 01ea72f1c2d6154a515a494ca759d776ad26704c
5
5
  SHA512:
6
- metadata.gz: 8b4ca3411138117b483b941b784ea317192aaf3b096ed21c7f5199ae49c52b068571830d56a5094f84ccc0a60ab542cb770592493058f8609b5ec5c4822a8275
7
- data.tar.gz: 7973440b5f97fd441219c2806da6c74fe43b06dbc230e59342111bfcccbf6bea42ee5c016ccc96a4ace8c7079478828b7bc71e41f5919c96b9d1142a8a3ebad9
6
+ metadata.gz: bcb3906e0e1655a5fee5b95e2546b744a08202a7a4ee7bfbaeeec4991a022682eba5e10b438c0f227df01c0104d5bff4b390724bfe98315132f01acf3233646d
7
+ data.tar.gz: 360d70242d2440b2835dd60d42e074a2d600bba5c405e35f927c8d42cbb2a77472af5102c77c56b0140f9ef570fb98acb0a2f6d5b67d943ae4b3eb9b03397942
@@ -18,3 +18,4 @@
18
18
  @import settings/functions/animation
19
19
  @import settings/functions/display
20
20
  @import settings/functions/assign-inputs
21
+ @import settings/functions/flex
@@ -27,3 +27,4 @@
27
27
  @import settings/mixins/image
28
28
  @import settings/mixins/word-wrap
29
29
  @import settings/mixins/form
30
+ @import settings/mixins/flex
@@ -0,0 +1,70 @@
1
+ @function justify-content($value)
2
+ @if $value == "flex-start" or $value == "flex-end" or $value == "center" or $value == "space-between" or $value == "space-around" or $value == "justify-content-inherit" or $value == "justify-content-initial" or $value == "justify-content-unset"
3
+ @return true
4
+ @else
5
+ @return null
6
+
7
+ @function align-items($value)
8
+ @if $value == "flex-start" or $value == "flex-end" or $value == "center" or $value == "baseline" or $value == "stretch" or $value == "align-items-inherit" or $value == "align-items-initial" or $value == "align-items-unset"
9
+ @return true
10
+ @else
11
+ @return null
12
+
13
+ @function flex-direction($value)
14
+ @if $value == "row" or $value == "row-reverse" or $value == "column" or $value == "column-reverse" or $value == "flex-direction-initial" or $value == "flex-direction-inherit"
15
+ @return true
16
+ @else
17
+ @return null
18
+
19
+ @function flex-wrap($value)
20
+ @if $value == "nowrap" or $value == "wrap" or $value == "wrap-reverse" or $value == "flex-wrap-initial" or $value == "flex-wrap-inherit"
21
+ @return true
22
+ @else
23
+ @return null
24
+
25
+ @function flex-grow($value)
26
+ @if unitless_number($value) or $value == "flex-grow-initial" or $value == "flex-grow-inherit"
27
+ @return true
28
+ @else
29
+ @return null
30
+
31
+ @function flex-shrink($value)
32
+ @if unitless_number($value) or $value == "flex-shrink-initial" or $value == "flex-shrink-inherit"
33
+ @return true
34
+ @else
35
+ @return null
36
+
37
+ @function flex-basis($value)
38
+ @if unit_number($value) or $value == "flex-basis-initial" or $value == "flex-basis-inherit"
39
+ @return true
40
+ @else
41
+ @return null
42
+
43
+ @function flex($values...)
44
+ @if length($value) > 3
45
+ @return null
46
+ @else
47
+ @if flex-grow(nth($value, 1))
48
+ @if length($value) = 3
49
+ @if flex-shrink(nth($value, 2)) and flex-flex-basis(nth($value, 3))
50
+ @return true
51
+ @else if length($value) = 2
52
+ @if flex-shrink(nth($value, 2))
53
+ @return true
54
+ @else
55
+ @return true
56
+ @else
57
+ @return null
58
+
59
+ @function flex-flow($values...)
60
+ @if length($value) > 2
61
+ @return null
62
+ @else
63
+ @if flex-direction(nth($value, 1))
64
+ @if length($value) = 2
65
+ @if flex-wrap(nth($value, 2))
66
+ @return true
67
+ @else
68
+ @return true
69
+ @else
70
+ @return null
@@ -12,6 +12,13 @@
12
12
  @else
13
13
  @return null
14
14
 
15
+ // $n以下のときにtrue
16
+ @function or_less_nth($value, $n)
17
+ @if length($value) =< $n
18
+ @return true
19
+ @else
20
+ @return null
21
+
15
22
  // $n以上のときだけ$valueを出す
16
23
  @function optional_nth($value, $n, $false-value: null)
17
24
  @if or_more_nth($value, $n)
@@ -0,0 +1,5 @@
1
+ =flex($value1: null, $value2: null, $value3: null, $value4: null)
2
+ justify-content: $value1
3
+ align-items: $value2
4
+ flex: $value3
5
+ flex-flow: $value4
@@ -157,7 +157,29 @@
157
157
  .row
158
158
  @for $i from 0 through 16
159
159
  $gutter-size: $i * 4
160
- &.is-gutter-width-#{$gutter-size}
161
- +margin(horizontal, px_to_rem($gutter-size * 1px, $base-px) / -2)
162
- >[class*=col-]
163
- +padding(horizontal, px_to_rem($gutter-size * 1px, $base-px) / 2)
160
+ $breakpoints: xs, sm, md, lg, xl, false
161
+ $scopes: up, down, only
162
+ @each $breakpoint in $breakpoints
163
+ @if $breakpoint
164
+ @each $scope in $scopes
165
+ &.is-gutter-width-#{$gutter-size}-#{$breakpoint}-#{$scope}
166
+ @if $scope == up
167
+ +media-breakpoint-up($breakpoint)
168
+ +margin(horizontal, px_to_rem($gutter-size * 1px, $base-px) / -2)
169
+ >[class*=col-]
170
+ +padding(horizontal, px_to_rem($gutter-size * 1px, $base-px) / 2)
171
+ @else if $scope == down
172
+ +media-breakpoint-down($breakpoint)
173
+ +margin(horizontal, px_to_rem($gutter-size * 1px, $base-px) / -2)
174
+ >[class*=col-]
175
+ +padding(horizontal, px_to_rem($gutter-size * 1px, $base-px) / 2)
176
+ @else if $scope == only
177
+ +media-breakpoint-only($breakpoint)
178
+ +margin(horizontal, px_to_rem($gutter-size * 1px, $base-px) / -2)
179
+ >[class*=col-]
180
+ +padding(horizontal, px_to_rem($gutter-size * 1px, $base-px) / 2)
181
+ @else
182
+ &.is-gutter-width-#{$gutter-size}
183
+ +margin(horizontal, px_to_rem($gutter-size * 1px, $base-px) / -2)
184
+ >[class*=col-]
185
+ +padding(horizontal, px_to_rem($gutter-size * 1px, $base-px) / 2)
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.26",
3
+ "version": "0.12.27",
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.12.26"
2
+ VERSION = "0.12.27"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.26",
3
+ "version": "0.12.27",
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.12.26
4
+ version: 0.12.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-13 00:00:00.000000000 Z
11
+ date: 2017-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -117,6 +117,7 @@ files:
117
117
  - app/assets/stylesheets/settings/functions/_content.sass
118
118
  - app/assets/stylesheets/settings/functions/_cursor.sass
119
119
  - app/assets/stylesheets/settings/functions/_display.sass
120
+ - app/assets/stylesheets/settings/functions/_flex.sass
120
121
  - app/assets/stylesheets/settings/functions/_image.sass
121
122
  - app/assets/stylesheets/settings/functions/_length.sass
122
123
  - app/assets/stylesheets/settings/functions/_list.sass
@@ -139,6 +140,7 @@ files:
139
140
  - app/assets/stylesheets/settings/mixins/_border.sass
140
141
  - app/assets/stylesheets/settings/mixins/_break-points.sass
141
142
  - app/assets/stylesheets/settings/mixins/_filters.sass
143
+ - app/assets/stylesheets/settings/mixins/_flex.sass
142
144
  - app/assets/stylesheets/settings/mixins/_form.sass
143
145
  - app/assets/stylesheets/settings/mixins/_grid.sass
144
146
  - app/assets/stylesheets/settings/mixins/_ie-hacks.sass