oulu 0.14.1 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/modules/buttons/_button-sizes.sass +46 -31
  3. data/app/assets/stylesheets/settings/mixins/_grid.sass +1 -5
  4. data/app/assets/stylesheets/settings/variables/_default.sass +1 -1
  5. data/bower.json +1 -1
  6. data/lib/oulu/version.rb +1 -1
  7. data/package.json +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0076f843d49e7314157201d1cb6ac2a9e51c2795
4
- data.tar.gz: b4b8fd056b6f07059294a4133c2cce64e0635aa1
3
+ metadata.gz: ef3141512c83f52c58d46075948816d8b81830e5
4
+ data.tar.gz: 914495c549f894320e65ae449515bd65c135e08d
5
5
  SHA512:
6
- metadata.gz: 526d4a10b1b818993d39ba8de15b8187bb84607e51f2db505842df4344fe8d4d93f8604f215197e51ee3c0631c6fa01181ced81617cb2ad0d713457f8b330fcc
7
- data.tar.gz: e33c15facb0b0c9ae614edab91c52f886e68517ec3aca1a7774df40ed549e2bbcd72a9723e93c7ed42524a98a34eb54879f37a40b8ca4443470ca701048e2940
6
+ metadata.gz: 2575124271db7afd852b8ee4bc6b84a4afcc4663977a36f4b7ebd4fd0fb171bcffa7be55ae98693cd6e4ac6a8b8eef319179f84fd6efc5e0a8352c16afd317ad
7
+ data.tar.gz: 4055f7ef92c4ac6f6e481b12858014ff476ae4a46f92f1e39f0d2e9891a257c04090ca97460238a5f0bed93e1039f81ebacdae0fdaf0b76680e9fd4df85fa863
data/app/assets/stylesheets/modules/buttons/_button-sizes.sass CHANGED
@@ -1,8 +1,29 @@
1
1
  =set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
2
2
  font-size: $font-size
3
3
  min-height: $button-height
4
- +padding(horizontal, ($font-size * $horizontal-padding))
4
+ $horizontal-padding-width: $font-size * $horizontal-padding
5
+ +padding(horizontal, $horizontal-padding-width)
5
6
  +padding(vertical, $vertical-padding)
7
+ &.is-icon
8
+ font-size: $font-size * 1.5
9
+ &.is-radio
10
+ $radio-input-size: $font-size * 1.25
11
+ $radio-check-icon-size: $font-size * .6
12
+ padding-left: $radio-input-size + $horizontal-padding-width
13
+ &::before
14
+ +size($radio-input-size)
15
+ +position(absolute, left $horizontal-padding-width, top 50%)
16
+ margin-top: $radio-input-size / -2
17
+ &.is-active
18
+ &::after
19
+ +size($radio-check-icon-size)
20
+ +position(absolute, left $horizontal-padding-width, top 50%)
21
+ margin-top: $radio-check-icon-size / -2
22
+ margin-left: ($radio-input-size - $radio-check-icon-size) / 2
23
+ &.is-border
24
+ +padding(vertical, $vertical-padding - .125rem)
25
+ &.is-icon
26
+ +padding(vertical, 0)
6
27
 
7
28
  =button-style-border($color)
8
29
  color: $color
@@ -13,6 +34,17 @@
13
34
  &.is-active
14
35
  background-color: $color
15
36
  color: luma_contrast_color($color)
37
+ &.is-radio
38
+ &::before
39
+ border: solid .0625rem
40
+ &:hover
41
+ &::before
42
+ box-shadow: 0 0 2px 1px $info
43
+ &.is-active
44
+ &::before
45
+ border-color: $warning
46
+ &::after
47
+ background-color: $warning
16
48
 
17
49
  =button-style-colord($color)
18
50
  color: luma_contrast_color($color)
@@ -39,63 +71,46 @@
39
71
  $vertical-padding: ($button-height - ($font-size * 1.45))/2
40
72
  $horizontal-padding: $button-xs-horizontal-padding
41
73
  +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
42
- &.is-icon
43
- font-size: $font-size * 1.5
44
- &.is-border
45
- +padding(vertical, $vertical-padding - .125rem)
46
- &.is-icon
47
- +padding(vertical, 0)
48
74
  &.is-sm
49
75
  $font-size: $sm-button-font-size
50
76
  $button-height: $font-size * $button-sm-height-ratio
51
77
  $vertical-padding: ($button-height - ($font-size * 1.45))/2
52
78
  $horizontal-padding: $button-sm-horizontal-padding
53
79
  +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
54
- &.is-icon
55
- font-size: $font-size * 1.5
56
- &.is-border
57
- +padding(vertical, $vertical-padding - .125rem)
58
- &.is-icon
59
- +padding(vertical, 0)
60
80
  &.is-md
61
81
  $font-size: $md-button-font-size
62
82
  $button-height: $font-size * $button-md-height-ratio
63
83
  $vertical-padding: ($button-height - ($font-size * 1.45))/2
64
84
  $horizontal-padding: $button-md-horizontal-padding
65
85
  +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
66
- &.is-icon
67
- font-size: $font-size * 1.5
68
- &.is-border
69
- +padding(vertical, $vertical-padding - .125rem)
70
- &.is-icon
71
- +padding(vertical, 0)
72
86
  &.is-lg
73
87
  $font-size: $lg-button-font-size
74
88
  $button-height: $font-size * $button-lg-height-ratio
75
89
  $vertical-padding: ($button-height - ($font-size * 1.45))/2
76
90
  $horizontal-padding: $button-lg-horizontal-padding
77
91
  +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
78
- &.is-icon
79
- font-size: $font-size * 1.5
80
- &.is-border
81
- +padding(vertical, $vertical-padding - .125rem)
82
- &.is-icon
83
- +padding(vertical, 0)
84
92
  &.is-xl
85
93
  $font-size: $xl-button-font-size
86
94
  $button-height: $font-size * $button-xl-height-ratio
87
95
  $vertical-padding: ($button-height - ($font-size * 1.45))/2
88
96
  $horizontal-padding: $button-xl-horizontal-padding
89
97
  +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
90
- &.is-icon
91
- font-size: $font-size * 1.5
92
- &.is-border
93
- +padding(vertical, $vertical-padding - .125rem)
94
- &.is-icon
95
- +padding(vertical, 0)
98
+
96
99
  &.is-icon
97
100
  +padding(vertical, 0)
98
101
 
102
+ &.is-radio
103
+ +position(relative)
104
+ &::before
105
+ content: ""
106
+ display: block
107
+ border-radius: 50%
108
+ &.is-active
109
+ &::after
110
+ content: ""
111
+ display: block
112
+ border-radius: 50%
113
+
99
114
  &.is-border-radius
100
115
  border-radius: .25rem
101
116
  .is-button-group li:first-child &
data/app/assets/stylesheets/settings/mixins/_grid.sass CHANGED
@@ -4,11 +4,7 @@
4
4
 
5
5
  .#{$container-class-name}
6
6
  +make-container
7
-
8
- // For each breakpoint, define the maximum width of the container in a media query
9
- @each $breakpoint, $container-max-width in $container-max-widths
10
- +media-breakpoint-up($breakpoint)
11
- max-width: $container-max-width
7
+ max-width: $container-max-width
12
8
 
13
9
  // Fluid container
14
10
  //
data/app/assets/stylesheets/settings/variables/_default.sass CHANGED
@@ -29,7 +29,7 @@ $container-class-name: container !default
29
29
 
30
30
  $grid-breakpoints: (xs: 0, sm: 34em, md: 48em, lg: 62em, xl: 75em) !default
31
31
  +_assert-ascending($grid-breakpoints, "$grid-breakpoints")
32
- $container-max-widths: (sm: 34rem, md: 45rem, lg: 60rem, xl: 72.25rem) !default
32
+ $container-max-width: 72.25rem!default
33
33
 
34
34
  // 横一列の最大カラム数
35
35
  $grid-columns: 12 !default
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.14.1",
3
+ "version": "0.15.0",
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.14.1"
2
+ VERSION = "0.15.0"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.14.1",
3
+ "version": "0.15.0",
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.14.1
4
+ version: 0.15.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-13 00:00:00.000000000 Z
11
+ date: 2017-09-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor