Skip to content

Commit fbbe8d1

Browse files
committed
fix conflict with 'show' class
1 parent 3572631 commit fbbe8d1

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/components/contractors/List.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AnimateLink extends Component {
1616
render () {
1717
const extra_classes = this.props.className ? this.props.className + ' ' : ''
1818
return (
19-
<Link to={this.props.to} className={extra_classes + 'tcs-animate-entry' + (this.state.show ? ' show' : '')}>
19+
<Link to={this.props.to} className={extra_classes + 'tcs-animate-entry' + (this.state.show ? ' tcs-show' : '')}>
2020
{this.props.children}
2121
</Link>
2222
)

src/components/shared/Modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Modal extends Component {
4242

4343
render () {
4444
return (
45-
<div className={'tcs-modal-mask' + (this.state.show ? ' show' : '')} onClick={this.close}>
45+
<div className={'tcs-modal-mask' + (this.state.show ? ' tcs-show' : '')} onClick={this.close}>
4646
<div className="tcs-modal" onClick={e => e.stopPropagation()}>
4747
<div className="tcs-header">
4848
<h2>{this.props.title}</h2>

src/styles/contractors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
.tcs-animate-entry {
4949
opacity: 0;
5050
transition: all .5s ease;
51-
&.show {
51+
&.tcs-show {
5252
opacity: 1;
5353
}
5454
}

src/styles/modal.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
background-color: rgba($back-colour, $back-colour, $back-colour, .6);
2727
opacity: 0;
2828
transition: all .3s ease;
29-
&.show {
29+
&.tcs-show {
3030
opacity: 1;
3131
.tcs-modal {
3232
transform: translate(0, 0);

0 commit comments

Comments
 (0)