Skip to content

Commit ba4d57e

Browse files
author
Seth Lemmons
committed
Carousel - tidy up spaces and CSS per feedback
1 parent 3875b11 commit ba4d57e

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

20-carousel/a-carousel/src/Carousel.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
background-color: #b5b5b5;
7171
}
7272
.nav-strip .nav.active .nav-dot {
73-
background-color: #1e8bfb !important;
73+
background-color: #1e8bfb;
7474
}
7575

7676
.carousel .card {

20-carousel/a-carousel/src/Carousel.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@ class Carousel extends Component {
1818
}
1919

2020
render () {
21-
const { children, className, position } = this.props;
21+
let { className } = this.props;
22+
className = className ? ` ${className}` : '';
23+
24+
const { children, position } = this.props;
2225
const { activecard } = this.state;
2326
const xPositions = ['top', 'bottom'],
2427
axis = xPositions.includes(position) ? 'x' : 'y';
2528

2629
return (
2730
<div
2831
{...this.props}
29-
className = {`${className} carousel ${position}`}
32+
className = {`carousel ${position}${className}`}
3033
>
3134
<div className={`nav-strip`}>
3235
{React.Children.map(children, (child, i) => {
@@ -47,15 +50,17 @@ class Carousel extends Component {
4750
axis={axis}
4851
>
4952
{React.Children.map(children, (child, i) => {
50-
const { className } = child.props,
51-
isActive = (i === activecard) ? 'active' : '',
52-
cardProps = {
53-
...child.props,
54-
style : {flex: 1},
55-
className : `${className} card ${isActive}`,
56-
cardindex : i,
57-
activecard
58-
};
53+
let { className } = child.props;
54+
className = className ? ` ${className}` : '';
55+
56+
const isActive = (i === activecard) ? ' active' : '';
57+
const cardProps = {
58+
...child.props,
59+
style : {flex: 1},
60+
className : ` card${isActive}${className}`,
61+
cardindex : i,
62+
activecard
63+
};
5964

6065
return React.cloneElement(child, cardProps);
6166
})}

0 commit comments

Comments
 (0)