middleman-oulu 0.6.25 → 0.6.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/assets/stylesheets/_oulu.sass +1 -4
- data/assets/stylesheets/modules/buttons/_button-base.sass +10 -7
- data/assets/stylesheets/modules/buttons/styles/_normal.sass +26 -8
- data/assets/stylesheets/settings/functions/_color.sass +4 -9
- data/lib/middleman-oulu/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f2fd30e9d1a8a04404bcee549c1921994a98ead2
|
4
|
+
data.tar.gz: 1ed24d1de2bf070e00a3505689fa6d888ca79a04
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1c81d7a32a8dd237c9caa7bba38c2c683bc1402907b9bb47d06ba49dd808edf559a7bacd382c0abbcd2e89e19e505311dd6bf893d852078e2ad43619511c7b9e
|
7
|
+
data.tar.gz: c7e60c78a36413b9566fca61ccd2173709bfb0f3764ad15a0e6531943fe0a9220927aee7a6067c63da1cf0b2116701f0cf88bb5a89c6e7fe1a028c05d6fbe2f1
|
@@ -27,22 +27,25 @@
|
|
27
27
|
+padding(horizontal, $height/2)
|
28
28
|
@if $font-size > 12px
|
29
29
|
font-weight: bold
|
30
|
-
i
|
30
|
+
i,
|
31
|
+
.is-button-icon
|
31
32
|
@if $font-size > 28
|
32
33
|
+rem('margin-right', $font-size/4)
|
33
34
|
@else
|
34
35
|
+rem('margin-right', $font-size/3)
|
35
36
|
&.has-right-icon
|
36
|
-
i
|
37
|
+
i,
|
38
|
+
.is-button-icon
|
37
39
|
margin-right: 0
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
40
|
+
@if $font-size > 28
|
41
|
+
+rem('margin-left', $font-size/4)
|
42
|
+
@else
|
43
|
+
+rem('margin-left', $font-size/3)
|
42
44
|
&.is-input-container
|
43
45
|
padding: 0
|
44
46
|
+relative
|
45
|
-
i
|
47
|
+
i,
|
48
|
+
.is-button-icon
|
46
49
|
+absolute(left $height/2, top 0)
|
47
50
|
+rem('line-height', $height - ($border-width*2))
|
48
51
|
input
|
@@ -1,25 +1,43 @@
|
|
1
|
-
=normal-button-color($color)
|
1
|
+
=normal-button-color($color, $text-color: true)
|
2
2
|
background-color: $color
|
3
3
|
+background-image(linear-gradient(top, tint($color, 6%) 0%, shade($color, 6%) 100%))
|
4
|
-
color: luma_contrast_color($color)
|
5
4
|
+border(all, solid)
|
6
5
|
border-color: shade($color, 10%) shade($color, 16%) shade($color, 26%)
|
7
6
|
text-shadow: if(luma_bright($color), lighten($color, 18%) 0 1px 0, darken($color, 18%) 0 -1px 0)
|
7
|
+
@if $text-color
|
8
|
+
color: luma_contrast_color($color)
|
9
|
+
&:hover,
|
10
|
+
&.hover,
|
11
|
+
&.is-hover,
|
12
|
+
&:active,
|
13
|
+
&.active,
|
14
|
+
&.is-active
|
15
|
+
color: luma_contrast_color($color)
|
8
16
|
|
9
17
|
=normal-button($color: blue)
|
10
18
|
+transition(.5s (background-image))
|
11
19
|
+border-radius(4px)
|
12
|
-
|
20
|
+
@if $color == white
|
21
|
+
+normal-button-color(#f2f2f2)
|
22
|
+
@else
|
23
|
+
+normal-button-color($color)
|
13
24
|
box-shadow: tint($color, 32%) 0 1px 0 inset, shade($color, 26%) 0 1px 0, rgba(black, .15) 0 2px 1px
|
14
25
|
&:hover,
|
15
26
|
&.hover,
|
16
27
|
&.is-hover
|
17
|
-
|
18
|
-
|
28
|
+
@if $color == white
|
29
|
+
+normal-button-color(lighten(#f2f2f2, 5%), false)
|
30
|
+
@else
|
31
|
+
+normal-button-color(lighten($color, 5%), false)
|
19
32
|
&:active,
|
20
33
|
&.active,
|
21
34
|
&.is-active
|
22
|
-
$color: lighten($color, 7%)
|
23
|
-
+normal-button-color($color)
|
24
35
|
+top(1px)
|
25
|
-
|
36
|
+
@if $color == white
|
37
|
+
$color: lighten(#f2f2f2, 7%)
|
38
|
+
+normal-button-color($color, false)
|
39
|
+
box-shadow: darken($color, 12%) 0 1px 0 inset, rgba(white, .3) 0 1px 1px
|
40
|
+
@else
|
41
|
+
$color: lighten($color, 7%)
|
42
|
+
+normal-button-color($color, false)
|
43
|
+
box-shadow: darken($color, 12%) 0 1px 0 inset, rgba(white, .3) 0 1px 1px
|
@@ -23,15 +23,10 @@
|
|
23
23
|
@return null
|
24
24
|
|
25
25
|
@function luma($color)
|
26
|
-
|
27
|
-
$
|
28
|
-
$
|
29
|
-
@
|
30
|
-
$rgb: nth($rgba, $i)
|
31
|
-
$rgb: $rgb / 255
|
32
|
-
$rgb: if($rgb < 0.03928, $rgb / 12.92, pow(($rgb + 0.055) / 1.055, 2.4))
|
33
|
-
$rgba2: append($rgba2, $rgb)
|
34
|
-
@return (0.2126 * nth($rgba2, 1) + 0.7152 * nth($rgba2, 2) + 0.0722 * nth($rgba2, 3)) * 100
|
26
|
+
$r: red($color)
|
27
|
+
$g: green($color)
|
28
|
+
$b: blue($color)
|
29
|
+
@return (0.299 * $r + 0.587 * $g + 0.114 * $b)/2.55
|
35
30
|
|
36
31
|
$ruma-threshold: 100 / pi() !default
|
37
32
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: middleman-oulu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- machida
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-07-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|