oulu 0.12.33 → 0.12.34

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: 6ba2498480822f38542b7cc60ac77d6ec2655e76
4
- data.tar.gz: 8b5a73db0e135af6a462da28a6af96181376b2dc
3
+ metadata.gz: ab7284d021a623db8cf30783887fb3102d6f2b13
4
+ data.tar.gz: d468ce91380a0580e4657b2f81ad3808abd8ddef
5
5
  SHA512:
6
- metadata.gz: f3b3319e798214d0b3be413a6bfd1ac76e7a42876c17257c3ef1954aa9554763de8c0bfc831da7d96e9cc6083627a85ac351e4025cca4c0458c02f8a791408cb
7
- data.tar.gz: 931a9037a105e833e131073775a9e5adcbb7ede1f80866a09a603a629fb50e0ec0f6ca34375da24c31c1201e9a382bba309c23f3cb5e458577e9c6e383ed61e1
6
+ metadata.gz: d8de520c2c3d7cbe991dd3f8df74733e6b719166740d5588c73b9d595469cf10c8f00084f208e2be842f587a806a7e38298b2fad8ce600b84ab970de75687748
7
+ data.tar.gz: 9a60cfdc19aafe4840846fbce76d9e8756ccdf2d94a3f936086f7c4f062ee7918398a1f423b8fb7e3c8449b1abef66109c35bf79f4a672d6b58b8069a25d21dd
@@ -19,18 +19,23 @@
19
19
  @if $size == 'xs'
20
20
  $font-size: $xs-button-font-size
21
21
  $button-height: $font-size * $button-xs-height-ratio - if($border-width, $border-width, 0) * 2
22
+ +padding(horizontal, ($button-height/$button-xs-width-ratio))
22
23
  @else if $size == 'sm'
23
24
  $font-size: $sm-button-font-size
24
25
  $button-height: $font-size * $button-sm-height-ratio - if($border-width, $border-width, 0) * 2
26
+ +padding(horizontal, ($button-height/$button-sm-width-ratio))
25
27
  @else if $size == 'md'
26
28
  $font-size: $md-button-font-size
27
29
  $button-height: $font-size * $button-md-height-ratio - if($border-width, $border-width, 0) * 2
30
+ +padding(horizontal, ($button-height/$button-md-width-ratio))
28
31
  @else if $size == 'lg'
29
32
  $font-size: $lg-button-font-size
30
33
  $button-height: $font-size * $button-lg-height-ratio - if($border-width, $border-width, 0) * 2
34
+ +padding(horizontal, ($button-height/$button-lg-width-ratio))
31
35
  @else if $size == 'xl'
32
36
  $font-size: $xl-button-font-size
33
37
  $button-height: $font-size * $button-xl-height-ratio - if($border-width, $border-width, 0) * 2
38
+ +padding(horizontal, ($button-height/$button-xl-width-ratio))
34
39
  @if $border-width
35
40
  border-width: $border-width
36
41
  @else
@@ -39,7 +44,6 @@
39
44
  $vertical-padding: ($button-height - $font-size - ($border-width * 2)) / 2
40
45
  +padding(vertical, $vertical-padding)
41
46
  +text-block($font-size 1)
42
- +padding(horizontal, $button-height/1.6)
43
47
  @if $border-radius
44
48
  border-radius: $border-radius
45
49
  @if $font-size > .6875rem and 1rem > $font-size
@@ -17,6 +17,7 @@
17
17
  &.is-block
18
18
  display: flex
19
19
  width: 100%
20
+ +padding(horizontal, 0)
20
21
  &[type="button"],
21
22
  &[type="reset"],
22
23
  &[type="submit"]
@@ -45,7 +45,6 @@
45
45
  @else
46
46
  @return $color
47
47
 
48
-
49
48
  @function luma_value($color-1, $color-2: null)
50
49
  @if $color-2
51
50
  @return abs(luma($color-1) - luma($color-2))
@@ -43,5 +43,7 @@ ol
43
43
  #{$all-text-inputs}
44
44
  color: $text-input-color
45
45
 
46
- +placeholder
47
- color: $placeholder-text
46
+ textarea,
47
+ input[type="text"]
48
+ +placeholder
49
+ color: $placeholder-text
@@ -42,3 +42,10 @@
42
42
  overflow: hidden
43
43
  text-overflow: ellipsis
44
44
  white-space: nowrap
45
+
46
+ =multi-lines-ellipsis($lines: 3, $line-height: 1.4)
47
+ display: -webkit-box
48
+ -webkit-box-orient: vertical
49
+ -webkit-line-clamp: $lines
50
+ overflow: hidden
51
+ max-height: (1em * $line-height) * $lines
@@ -29,6 +29,12 @@ $button-md-height-ratio: 2.85 !default
29
29
  $button-lg-height-ratio: 2.85 !default
30
30
  $button-xl-height-ratio: 2.85 !default
31
31
 
32
+ $button-xs-width-ratio: 1.6 !default
33
+ $button-sm-width-ratio: 1.6 !default
34
+ $button-md-width-ratio: 1.6 !default
35
+ $button-lg-width-ratio: 1.6 !default
36
+ $button-xl-width-ratio: 1.6 !default
37
+
32
38
  $button-checked-color: #4FC1E9 !default
33
39
  $button-checked-icon-color: #FC6E51 !default
34
40
 
@@ -4,7 +4,7 @@ $root-color: $default-text !default
4
4
  $root-cursor: default !default
5
5
  $root-font-family: sans-serif !default
6
6
  $root-font-size: if($base-px = 100px, 100%, $base-px) !default
7
- $root-line-height: 1.5 !default
7
+ $root-line-height: 1 !default
8
8
  $root-text-rendering: optimizeLegibility !default
9
9
 
10
10
  $anchor-text-decoration: none !default
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.33",
3
+ "version": "0.12.34",
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.33"
2
+ VERSION = "0.12.34"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.33",
3
+ "version": "0.12.34",
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.33
4
+ version: 0.12.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-03 00:00:00.000000000 Z
11
+ date: 2017-04-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor