formulate 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -39,6 +39,7 @@ module Formulate
|
|
|
39
39
|
|
|
40
40
|
def input(method, options={}, &block)
|
|
41
41
|
type = options.delete(:type)
|
|
42
|
+
label = options.delete(:label)
|
|
42
43
|
prefix = options.delete(:prefix)
|
|
43
44
|
suffix = options.delete(:suffix)
|
|
44
45
|
instructions = options.delete(:instructions)
|
|
@@ -89,7 +90,7 @@ module Formulate
|
|
|
89
90
|
send(type, method, options)
|
|
90
91
|
end unless block_given?
|
|
91
92
|
|
|
92
|
-
label =
|
|
93
|
+
label = label != false ? label(method, label) : nil
|
|
93
94
|
markup = [label, prefix, input, suffix].compact
|
|
94
95
|
markup.reverse! if type.in?(:check_box, :radio_button)
|
|
95
96
|
|
data/lib/formulate/version.rb
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
@import formulate/defaults
|
|
2
|
-
@import formulate/reset
|
|
3
2
|
|
|
4
3
|
form.formulate
|
|
5
4
|
margin: $spacer-size 0
|
|
@@ -12,22 +11,47 @@ form.formulate
|
|
|
12
11
|
input,
|
|
13
12
|
select,
|
|
14
13
|
textarea
|
|
14
|
+
-moz-box-sizing: content-box
|
|
15
|
+
-ms-box-sizing: content-box
|
|
16
|
+
-webkit-box-sizing: content-box
|
|
17
|
+
box-sizing: content-box
|
|
15
18
|
background: $input-background-color
|
|
16
19
|
border: $border-width solid $input-border-color
|
|
17
20
|
font-family: $input-font-family
|
|
18
21
|
font-size: 1em
|
|
19
22
|
margin: 0
|
|
20
23
|
padding: 0.25em
|
|
24
|
+
vertical-align: top
|
|
21
25
|
|
|
22
26
|
&:focus
|
|
23
27
|
border-color: $input-focus-border-color
|
|
24
28
|
outline: none
|
|
25
29
|
|
|
26
|
-
input
|
|
27
|
-
|
|
30
|
+
input
|
|
31
|
+
height: 1.25em
|
|
28
32
|
|
|
29
|
-
|
|
30
|
-
|
|
33
|
+
&[type="checkbox"],
|
|
34
|
+
&[type="radio"]
|
|
35
|
+
height: auto
|
|
36
|
+
padding: 0
|
|
37
|
+
vertical-align: baseline
|
|
38
|
+
width: auto
|
|
39
|
+
|
|
40
|
+
&:focus
|
|
41
|
+
outline: thin dotted #333
|
|
42
|
+
outline: 5px auto -webkit-focus-ring-color
|
|
43
|
+
|
|
44
|
+
&[type="file"]
|
|
45
|
+
height: 1.625em
|
|
46
|
+
line-height: 1.625em
|
|
47
|
+
padding: 0 0.25em
|
|
48
|
+
|
|
49
|
+
&[type="submit"]
|
|
50
|
+
-webkit-appearance: button
|
|
51
|
+
height: 1.125em
|
|
52
|
+
|
|
53
|
+
&[disabled]
|
|
54
|
+
border-color: $input-disabled-border-color
|
|
31
55
|
|
|
32
56
|
fieldset
|
|
33
57
|
border-top: $border-width solid $fieldset-border-color
|
|
@@ -97,6 +121,7 @@ form.formulate
|
|
|
97
121
|
|
|
98
122
|
input
|
|
99
123
|
@include button($submit-button-color)
|
|
124
|
+
vertical-align: baseline
|
|
100
125
|
|
|
101
126
|
a
|
|
102
127
|
font-weight: bold
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: formulate
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.7
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-05-
|
|
12
|
+
date: 2012-05-19 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: actionpack
|