oulu-rails 0.7.4 → 0.7.5

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: ebb174a90bdb7dc400e6a30fecaead97e059ae99
4
- data.tar.gz: 31e1cd51305176df882f1b44d57eb9d9e29ba20a
3
+ metadata.gz: ffb344fd5cad44240765b8e2a628e9fbab34be33
4
+ data.tar.gz: f63469f7cad545f0e757ac234dfe33c3436a7fc1
5
5
  SHA512:
6
- metadata.gz: 27d77d5e2afa3c77181c98ff87659e751b862db75fe1c7805e102520e194ef94c938f754f6ad39a6a64aae57a6b41f7ec6009a079afa15af69698a859f44b237
7
- data.tar.gz: 041c09414fbcd29d3b997f6fc6f20dfeb904daea9a91c6936e2f16339bcb8f830f1a95ec081302f98108f22210b3e35673648f2c2ab7a6f2d70e374afc239b1a
6
+ metadata.gz: 04c6d685bdcba05fff0d46af88f2f0735a35fe30f6e4c1578fe9540db2865e3fdab6be6db3bdb8aa8de2e8214520e8cf9485d3b7ac9c1e8c5ebc5a697c9d938b
7
+ data.tar.gz: 8bf89705d04d2e306b56105324ca42ab0424c6399268a570d90837ee951cdb62326812e380f1b7e98a731a7652c38a8af4c4cedc9e3956df335022d2fa4c0b68
@@ -1,3 +1,3 @@
1
1
  module OuluRails
2
- VERSION = "0.7.4"
2
+ VERSION = "0.7.5"
3
3
  end
@@ -9,6 +9,12 @@
9
9
  +inline-block
10
10
  +rem('font-size', 12px)
11
11
  +rem('margin-left', 6px)
12
+ &.is-disabled,
13
+ &:disabled
14
+ pointer-events: none
15
+ cursor: default
16
+ select
17
+ cursor: default
12
18
 
13
19
  // button-group
14
20
  .is-button-group
@@ -18,7 +24,7 @@
18
24
  letter-spacing: normal
19
25
  font-size: 0
20
26
  [class^="is-button"]
21
- +border-radius(0)
27
+ border-radius: 0
22
28
  &:first-child
23
29
  [class^="is-button"]
24
30
  +border-radius(left, 4px)
@@ -1,6 +1,6 @@
1
1
  $button-sizes: xs, sm, md, lg, xl !default
2
2
  $button-color-names: default, primary, success, warning, danger !default
3
- $button-styles: normal, border, bold-border, flat-emboss, material !default
3
+ $button-styles: normal, border, bold-border, flat-emboss, material, flat-round !default
4
4
 
5
5
  @import button-base
6
6
 
@@ -9,15 +9,10 @@ $button-styles: normal, border, bold-border, flat-emboss, material !default
9
9
  @import styles/border
10
10
  @import styles/flat-emboss
11
11
  @import styles/material
12
+ @import styles/flat-round
12
13
 
13
14
  @import button-helper
14
15
 
15
- // inputのスタイルを継承させる
16
- input[type= submit]
17
- color: inherit
18
- font-size: inherit
19
- font-weight: inherit
20
-
21
16
  =button($style, $size, $color, $options: false)
22
17
  +button-base
23
18
  @if $style == normal
@@ -35,6 +30,9 @@ input[type= submit]
35
30
  @else if $style == material
36
31
  +button-size($size, false, false)
37
32
  +material-button($color)
33
+ @else if $style == flat-round
34
+ +button-size($size, false, false)
35
+ +flat-round-button($color)
38
36
  @each $option in $options
39
37
  @if $option == 'left'
40
38
  text-align: left
@@ -1,5 +1,3 @@
1
- body
2
- content: #{luma(#f2f2f2)}
3
1
  =flat-emboss-button($color: blue)
4
2
  +transition(.5s (background-image))
5
3
  background-color: $color
@@ -0,0 +1,23 @@
1
+ =flat-round-button($color: blue)
2
+ +transition(.5s (background-image))
3
+ background-color: $color
4
+ color: luma_contrast_color($color)
5
+ font-weight: bold
6
+ border-radius: 1000px
7
+ &:hover,
8
+ &.hover,
9
+ &.is-hover
10
+ $color: lighten($color, 6%)
11
+ @if luma($color) > 90
12
+ background-color: #f2f2f2
13
+ @else
14
+ background-color: $color
15
+ &:active,
16
+ &.active,
17
+ &.is-active
18
+ $color: lighten($color, 6%)
19
+ @if luma($color) > 90
20
+ background-color: #f2f2f2
21
+ @else
22
+ background-color: $color
23
+ +top(1px)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oulu-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.4
4
+ version: 0.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-04 00:00:00.000000000 Z
11
+ date: 2015-12-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass-rails
@@ -99,6 +99,7 @@ files:
99
99
  - vendor/assets/stylesheets/modules/buttons/_buttons.sass
100
100
  - vendor/assets/stylesheets/modules/buttons/styles/_border.sass
101
101
  - vendor/assets/stylesheets/modules/buttons/styles/_flat-emboss.sass
102
+ - vendor/assets/stylesheets/modules/buttons/styles/_flat-round.sass
102
103
  - vendor/assets/stylesheets/modules/buttons/styles/_material.sass
103
104
  - vendor/assets/stylesheets/modules/buttons/styles/_normal.sass
104
105
  - vendor/assets/stylesheets/modules/navs/_tabs-nav.sass