oulu 0.12.19 → 0.12.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/modules/buttons/_button-base.sass +13 -5
  3. data/app/assets/stylesheets/settings/variables/_modules.sass +6 -0
  4. data/bower.json +1 -1
  5. data/lib/oulu/version.rb +1 -1
  6. data/package.json +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2d663cde1ae20f063d93a695fc43f9db1dae8de4
4
- data.tar.gz: 2b4017090c98335b464483dc2290cff8d1b8d07e
3
+ metadata.gz: 1597afc626afc07fd8eac6ac4a98d7b820ebb0bc
4
+ data.tar.gz: 4bb8e1d68c6b6f11ad51030933bfe22011002029
5
5
  SHA512:
6
- metadata.gz: e865948ecf4ab65827901a12bb988460b4ba0367e675df4a0ba1f5a737c70a82762c9d488abf44c60d7423d5885a5ba848876269dc38c8630da825fd82fa41c5
7
- data.tar.gz: dacc3bcf78760fe3c19e62641d8c37dcada5f055d7cdcc81598c0e4dcb4d7fd0884112100fb11cc973f19c060224584d944b68544c798e9c0ed29319d0422326
6
+ metadata.gz: f045035a1579ee92ec06fe2be8ce7b99352ad1eeb210162a5bc49b2cf5eb182abb187fa93c52445c538e9812d3351f0b38873d3dd035ae29bf016b79f11275a9
7
+ data.tar.gz: af7aae806bbc9810b7572b3d9b5908bde07af8e58feb7e40d666034f7f6e894e36909b5a61e667b7f049c13abcac14e4a41d9814f4515ebd689d13b39d3727b4
data/app/assets/stylesheets/modules/buttons/_button-base.sass CHANGED
@@ -13,27 +13,32 @@
13
13
  &[type="submit"]
14
14
  display: inline-block
15
15
 
16
- =button-size($size, $border-width: false, $border-radius: .25rem, $button-height-ratio: 2.85)
16
+ =button-size($size, $border-width: false, $border-radius: .25rem)
17
17
  $font-size: ""
18
+ $button-height: ""
18
19
  @if $size == 'xs'
19
20
  $font-size: $xs-button-font-size
21
+ $button-height: $font-size * $button-xs-height-ratio - if($border-width, $border-width, 0) * 2
20
22
  @else if $size == 'sm'
21
23
  $font-size: $sm-button-font-size
24
+ $button-height: $font-size * $button-sm-height-ratio - if($border-width, $border-width, 0) * 2
22
25
  @else if $size == 'md'
23
26
  $font-size: $md-button-font-size
27
+ $button-height: $font-size * $button-md-height-ratio - if($border-width, $border-width, 0) * 2
24
28
  @else if $size == 'lg'
25
29
  $font-size: $lg-button-font-size
30
+ $button-height: $font-size * $button-lg-height-ratio - if($border-width, $border-width, 0) * 2
26
31
  @else if $size == 'xl'
27
32
  $font-size: $xl-button-font-size
28
- $button-height: $font-size * $button-height-ratio - if($border-width, $border-width, 0) * 2
33
+ $button-height: $font-size * $button-xl-height-ratio - if($border-width, $border-width, 0) * 2
29
34
  @if $border-width
30
35
  +border(all, $border-width)
31
36
  @else
32
37
  $border-width: 0
33
- height: $button-height
34
- $vertical-padding: ($button-height - $font-size * 1.45 - ($border-width* 2)) / 2
38
+ height: $font-size * $button-xs-height-ratio
39
+ $vertical-padding: ($button-height - $font-size - ($border-width * 2)) / 2
35
40
  +padding(vertical, $vertical-padding)
36
- +text-block($font-size 1.45)
41
+ +text-block($font-size 1)
37
42
  +padding(horizontal, $button-height/1.6)
38
43
  @if $border-radius
39
44
  +border-radius($border-radius)
@@ -47,6 +52,9 @@
47
52
  margin-right: $font-size/4
48
53
  @else
49
54
  margin-right: $font-size/3
55
+ &.is-multi-lines
56
+ height: auto
57
+ line-height: 1.45
50
58
  &.has-right-icon
51
59
  i,
52
60
  .is-button-icon
data/app/assets/stylesheets/settings/variables/_modules.sass CHANGED
@@ -23,6 +23,12 @@ $button-sizes: xs, sm, md, lg, xl !default
23
23
  $button-color-names: secondary, primary, success, info, warning, danger !default
24
24
  $button-styles: normal, border, bold-border, flat-emboss, material, flat-round, super-bold-border, standard !default
25
25
 
26
+ $button-xs-height-ratio: 2.85 !default
27
+ $button-sm-height-ratio: 2.85 !default
28
+ $button-md-height-ratio: 2.85 !default
29
+ $button-lg-height-ratio: 2.85 !default
30
+ $button-xl-height-ratio: 2.85 !default
31
+
26
32
  $button-checked-color: #4FC1E9 !default
27
33
  $button-checked-icon-color: #FC6E51 !default
28
34
 
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.19",
3
+ "version": "0.12.20",
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.19"
2
+ VERSION = "0.12.20"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.19",
3
+ "version": "0.12.20",
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.19
4
+ version: 0.12.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-27 00:00:00.000000000 Z
11
+ date: 2016-11-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor