Skip to content
This repository was archived by the owner on Nov 26, 2021. It is now read-only.

Commit ca50eae

Browse files
committed
support merge className
1 parent dde4b74 commit ca50eae

21 files changed

Lines changed: 72 additions & 49 deletions

example/BasicForm.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ class BasicForm extends Component {
101101
<div className="form-group">
102102
<label htmlFor="email">Email:</label>
103103
<Text
104+
className="email"
104105
id="email"
105106
name="email"
106107
type="email"

example/BasicForm.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
color: #a94442;
1111
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1212
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
13-
}
1413

15-
.valid-error:focus {
16-
border-color: #843534;
17-
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
18-
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
14+
&:focus {
15+
border-color: #843534;
16+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
17+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
18+
}
1919
}
2020

2121
.valid-error-message {
@@ -29,10 +29,10 @@
2929
border-color: #3c763d;
3030
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
3131
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
32-
}
3332

34-
.valid-success:focus {
35-
border-color: #2b542c;
36-
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
37-
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
38-
}
33+
&:focus {
34+
border-color: #2b542c;
35+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
36+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
37+
}
38+
}

lib/FormControl.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/FormControl.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Checkbox.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Checkbox.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Radio.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Radio.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Select.js

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Inputs/Select.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)