oulu-rails 0.6.28 → 0.6.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/oulu-rails/version.rb +1 -1
- data/vendor/assets/stylesheets/helpers/_block.sass +7 -2
- data/vendor/assets/stylesheets/helpers/_border.sass +4 -4
- data/vendor/assets/stylesheets/helpers/_margin-padding.sass +56 -0
- data/vendor/assets/stylesheets/modules/buttons/_button-base.sass +7 -2
- data/vendor/assets/stylesheets/modules/buttons/_buttons.sass +8 -5
- data/vendor/assets/stylesheets/modules/buttons/styles/_border.sass +0 -1
- data/vendor/assets/stylesheets/modules/buttons/styles/_flat-emboss.sass +0 -1
- data/vendor/assets/stylesheets/modules/buttons/styles/_normal.sass +1 -2
- 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: 913d2926042b17e0387b3d152c9e5af3b5dc4722
|
|
4
|
+
data.tar.gz: 1977caa16d332a16ef452615efdddf5e02510cf8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 360c71129e2b7c0e1bf8774914ceef80759f3e7265d0c34a0e46fa2a74d63257e26a9b1b9cfdfc0365be9b99ca275e6de7e7276b755402c532e37d129c8f0290
|
|
7
|
+
data.tar.gz: ec6440350c3084e8573ceab079890a17c1b9522d44d4b23a3f89ad3bb801bca664326ed143597fbc9e9a1474ff3f435bfa37a7639ce67a546a4a4cf99eab4b6f
|
data/lib/oulu-rails/version.rb
CHANGED
|
@@ -25,6 +25,12 @@ body
|
|
|
25
25
|
.is-right
|
|
26
26
|
float: right
|
|
27
27
|
|
|
28
|
+
// float
|
|
29
|
+
.is-float-left
|
|
30
|
+
float: left
|
|
31
|
+
.is-float-right
|
|
32
|
+
float: right
|
|
33
|
+
|
|
28
34
|
// block link
|
|
29
35
|
.is-block-link
|
|
30
36
|
display: block
|
|
@@ -37,8 +43,7 @@ body
|
|
|
37
43
|
|
|
38
44
|
// overflow
|
|
39
45
|
.is-scroll-x-wrapper
|
|
40
|
-
overflow
|
|
41
|
-
overflow-y: hidden
|
|
46
|
+
+overflow(auto hidden)
|
|
42
47
|
-webkit-overflow-scrolling: touch
|
|
43
48
|
width: 100%
|
|
44
49
|
position: relative
|
|
@@ -6,11 +6,11 @@ body
|
|
|
6
6
|
+border(horizontal, none)
|
|
7
7
|
.is-vertical-border-none
|
|
8
8
|
+border(vertical, none)
|
|
9
|
-
.is-border-left
|
|
9
|
+
.is-border-left-none
|
|
10
10
|
border-left: none
|
|
11
|
-
.is-border-right
|
|
11
|
+
.is-border-right-none
|
|
12
12
|
border-right: none
|
|
13
|
-
.is-border-top
|
|
13
|
+
.is-border-top-none
|
|
14
14
|
border-top: none
|
|
15
|
-
.is-border-bottom
|
|
15
|
+
.is-border-bottom-none
|
|
16
16
|
border-bottom: none
|
|
@@ -52,3 +52,59 @@ body
|
|
|
52
52
|
.is-lg-horizontal-padding-0
|
|
53
53
|
+screen-lg
|
|
54
54
|
+padding(horizontal, 0)
|
|
55
|
+
|
|
56
|
+
// こっちに変更
|
|
57
|
+
body
|
|
58
|
+
@for $i from 0 through 20
|
|
59
|
+
.has-margin-bottom-#{$i*4}
|
|
60
|
+
+rem('margin-bottom', #{$i*4}px)
|
|
61
|
+
.has-margin-top-#{$i*4}
|
|
62
|
+
+rem('margin-top', #{$i*4}px)
|
|
63
|
+
.has-margin-left-#{$i*4}
|
|
64
|
+
+rem('margin-left', #{$i*4}px)
|
|
65
|
+
.has-margin-right-#{$i*4}
|
|
66
|
+
+rem('margin-right', #{$i*4}px)
|
|
67
|
+
.has-margin-horizontal-#{$i*4}
|
|
68
|
+
+margin(horizontal, #{$i*4}px)
|
|
69
|
+
.has-padding-bottom-#{$i*4}
|
|
70
|
+
+rem('padding-bottom', #{$i*4}px)
|
|
71
|
+
.has-padding-top-#{$i*4}
|
|
72
|
+
+rem('padding-top', #{$i*4}px)
|
|
73
|
+
.has-padding-left-#{$i*4}
|
|
74
|
+
+rem('padding-left', #{$i*4}px)
|
|
75
|
+
.has-padding-right-#{$i*4}
|
|
76
|
+
+rem('padding-right', #{$i*4}px)
|
|
77
|
+
.has-padding-horizontal-#{$i*4}
|
|
78
|
+
+padding(horizontal, #{$i*4}px)
|
|
79
|
+
|
|
80
|
+
// horizontal-margin-0
|
|
81
|
+
.has-horizontal-margin-0
|
|
82
|
+
+margin(horizontal, 0)
|
|
83
|
+
.has-xs-horizontal-margin-0
|
|
84
|
+
+screen-xs
|
|
85
|
+
+margin(horizontal, 0)
|
|
86
|
+
.has-sm-horizontal-margin-0
|
|
87
|
+
+screen-sm
|
|
88
|
+
+margin(horizontal, 0)
|
|
89
|
+
.has-md-horizontal-margin-0
|
|
90
|
+
+screen-md
|
|
91
|
+
+margin(horizontal, 0)
|
|
92
|
+
.has-lg-horizontal-margin-0
|
|
93
|
+
+screen-lg
|
|
94
|
+
+margin(horizontal, 0)
|
|
95
|
+
|
|
96
|
+
// horizontal-padding-0
|
|
97
|
+
.has-horizontal-padding-0
|
|
98
|
+
+padding(horizontal, 0)
|
|
99
|
+
.has-xs-horizontal-padding-0
|
|
100
|
+
+screen-xs
|
|
101
|
+
+padding(horizontal, 0)
|
|
102
|
+
.has-sm-horizontal-padding-0
|
|
103
|
+
+screen-sm
|
|
104
|
+
+padding(horizontal, 0)
|
|
105
|
+
.has-md-horizontal-padding-0
|
|
106
|
+
+screen-md
|
|
107
|
+
+padding(horizontal, 0)
|
|
108
|
+
.has-lg-horizontal-padding-0
|
|
109
|
+
+screen-lg
|
|
110
|
+
+padding(horizontal, 0)
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
text-decoration: none
|
|
9
9
|
-webkit-tap-highlight-color: transparent
|
|
10
10
|
|
|
11
|
-
=button-size($size, $border-width: 0)
|
|
11
|
+
=button-size($size, $border-width: 0, $border-radius: 4px)
|
|
12
12
|
$font-size: ""
|
|
13
13
|
@if $size == 'xs'
|
|
14
14
|
$font-size: 12px
|
|
@@ -21,10 +21,15 @@
|
|
|
21
21
|
@else if $size == 'xl'
|
|
22
22
|
$font-size: 20px
|
|
23
23
|
$height: round($font-size * 2 + $font-size/2.2)
|
|
24
|
-
|
|
24
|
+
@if $border-width
|
|
25
|
+
+border(all, $border-width)
|
|
26
|
+
@else
|
|
27
|
+
$border-width: 0
|
|
25
28
|
+text-block($font-size $height - ($border-width*2))
|
|
26
29
|
+rem('height', $height)
|
|
27
30
|
+padding(horizontal, $height/2)
|
|
31
|
+
@if $border-radius
|
|
32
|
+
+border-radius($border-radius)
|
|
28
33
|
@if $font-size > 12px
|
|
29
34
|
font-weight: bold
|
|
30
35
|
i,
|
|
@@ -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, flat-emboss, material !default
|
|
3
|
+
$button-styles: normal, border, bold-border, flat-emboss, material !default
|
|
4
4
|
|
|
5
5
|
@import button-base
|
|
6
6
|
|
|
@@ -21,16 +21,19 @@ input[type= submit]
|
|
|
21
21
|
=button($style, $size, $color, $options: false)
|
|
22
22
|
+button-base
|
|
23
23
|
@if $style == normal
|
|
24
|
-
+button-size($size, 1px)
|
|
24
|
+
+button-size($size, 1px, 4px)
|
|
25
25
|
+normal-button($color)
|
|
26
26
|
@else if $style == border
|
|
27
|
-
+button-size($size, 1px)
|
|
27
|
+
+button-size($size, 1px, 4px)
|
|
28
|
+
+border-button($color)
|
|
29
|
+
@else if $style == bold-border
|
|
30
|
+
+button-size($size, 2px, 8px)
|
|
28
31
|
+border-button($color)
|
|
29
32
|
@else if $style == flat-emboss
|
|
30
|
-
+button-size($size)
|
|
33
|
+
+button-size($size, false, 4px)
|
|
31
34
|
+flat-emboss-button($color)
|
|
32
35
|
@else if $style == material
|
|
33
|
-
+button-size($size)
|
|
36
|
+
+button-size($size, false, false)
|
|
34
37
|
+material-button($color)
|
|
35
38
|
@each $option in $options
|
|
36
39
|
@if $option == 'left'
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
+background-image(linear-gradient(top, tint($color, 6%) 0%, shade($color, 6%) 100%))
|
|
4
4
|
+border(all, solid)
|
|
5
5
|
border-color: shade($color, 10%) shade($color, 16%) shade($color, 26%)
|
|
6
|
-
text-shadow: if(luma_bright($color), lighten($color, 18%) 0 1px 0, darken($color, 18%) 0 -1px 0)
|
|
7
6
|
@if $text-color
|
|
8
7
|
color: luma_contrast_color($color)
|
|
8
|
+
text-shadow: if(luma_bright($color), lighten($color, 18%) 0 1px 0, darken($color, 18%) 0 -1px 0)
|
|
9
9
|
&:hover,
|
|
10
10
|
&.hover,
|
|
11
11
|
&.is-hover,
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
|
|
17
17
|
=normal-button($color: blue)
|
|
18
18
|
+transition(.5s (background-image))
|
|
19
|
-
+border-radius(4px)
|
|
20
19
|
@if $color == white
|
|
21
20
|
+normal-button-color(#f2f2f2)
|
|
22
21
|
@else
|
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.6.
|
|
4
|
+
version: 0.6.33
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- machida
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: sass-rails
|