Skip to content

Commit ce100b8

Browse files
author
Kakuev
committed
update
1 parent a829aa3 commit ce100b8

File tree

5 files changed

+34
-13
lines changed

5 files changed

+34
-13
lines changed

dist/bundle.css

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313
.flex-wrap {
1414
flex-wrap: wrap; }
1515

16+
button::-moz-focus-inner,
17+
button:focus::-moz-focus-inner {
18+
border: 0; }
19+
1620
.btn {
17-
padding: 0.3em 1em;
1821
border: 1px solid #d3d3d3;
1922
background: white;
20-
transition: all 0.2s;
21-
outline: none; }
23+
transition: all 0.2s; }
24+
.btn:focus {
25+
outline: 0; }
2226
.btn:hover {
2327
cursor: pointer; }
2428
.btn:disabled {
@@ -27,6 +31,10 @@
2731
.round-btn {
2832
border-radius: 30px; }
2933

34+
.primary-btn,
35+
.secondary-btn {
36+
padding: 0.7em 1.5em; }
37+
3038
.primary-btn {
3139
border: 1px solid #b515cf;
3240
color: white;

dist/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function (_Component) {
108108
key: "render",
109109
value: function render() {
110110
return React.createElement("button", {
111-
className: "btn ".concat(this.props.primary ? 'primary-btn' : 'secondary-btn'),
111+
className: "text-uppercase text-bold btn ".concat(this.props.primary ? 'primary-btn' : 'secondary-btn'),
112112
onClick: this.props.clickAction,
113113
disabled: this.props.disabled
114114
}, this.props.children);
@@ -176,7 +176,7 @@ function (_Component) {
176176
this.setState({
177177
checked: e.target.id
178178
});
179-
this.props.action(e.target.value);
179+
this.props.action(e.target);
180180
}
181181
}, {
182182
key: "openMore",
@@ -210,7 +210,7 @@ function (_Component) {
210210
return React.createElement("form", {
211211
action: "",
212212
className: "flex justify-content-center align-items-center flex-column"
213-
}, options.length <= 3 && options, options.length > 3 && options.slice(0, 3), !this.state.showHidden && React.createElement("label", {
213+
}, options.length <= 4 && options, options.length > 4 && options.slice(0, 3), !this.state.showHidden && options.length > 4 && React.createElement("label", {
214214
htmlFor: "more",
215215
className: "single-option ".concat(this.state.checked === 'more' ? 'checked-option' : '')
216216
}, React.createElement("input", {

src/components/Btn/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Btn extends Component {
88
render() {
99
return (
1010
<button
11-
className={`btn ${this.props.primary ? 'primary-btn' : 'secondary-btn'}`}
11+
className={`text-uppercase text-bold btn ${this.props.primary ? 'primary-btn' : 'secondary-btn'}`}
1212
onClick={this.props.clickAction}
1313
disabled={this.props.disabled}
1414
>

src/components/OptionsList/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class OptionsList extends Component {
1616
checked: e.target.id
1717
});
1818

19-
this.props.action(e.target.value);
19+
this.props.action(e.target);
2020
}
2121

2222
openMore(e) {
@@ -52,9 +52,10 @@ class OptionsList extends Component {
5252

5353
return (
5454
<form action="" className="flex justify-content-center align-items-center flex-column">
55-
{options.length <= 3 && options}
56-
{options.length > 3 && options.slice(0, 3)}
57-
{!this.state.showHidden && (
55+
{options.length <= 4 && options}
56+
{options.length > 4 && options.slice(0, 3)}
57+
{!this.state.showHidden &&
58+
options.length > 4 && (
5859
<label
5960
htmlFor="more"
6061
className={`single-option ${this.state.checked === 'more' ? 'checked-option' : ''}`}

src/style/_buttons.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1+
button::-moz-focus-inner,
2+
button:focus::-moz-focus-inner {
3+
border: 0;
4+
}
5+
16
.btn {
2-
padding: 0.3em 1em;
37
border: 1px solid $colorGrey;
48
background: $colorWhite;
59
transition: all 0.2s;
6-
outline: none;
10+
11+
&:focus {
12+
outline: 0;
13+
}
714

815
&:hover {
916
cursor: pointer;
@@ -18,6 +25,11 @@
1825
border-radius: 30px;
1926
}
2027

28+
.primary-btn,
29+
.secondary-btn {
30+
padding: 0.7em 1.5em;
31+
}
32+
2133
.primary-btn {
2234
border: 1px solid $themeColor;
2335
color: $colorWhite;

0 commit comments

Comments
 (0)