Skip to content

Commit

Permalink
fix: ∆
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonLantz committed Jan 27, 2017
1 parent c081b20 commit 1ae5ad4
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 25 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
},
"dependencies": {
"react-addons-css-transition-group": "^15.4.2",
"react-addons-transition-group": "^15.4.2",
"react-intl": "~2.0.1"
},
"devDependencies": {
Expand Down
6 changes: 1 addition & 5 deletions src/js/AlertList.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Lifecycle interface for ReactCSSTransitionGroup located in
// Component-specific.scss with the naming convention
// transitionName-lifecyclehook
import React, { Component } from 'react';
import Alert from './Alert';
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
Expand All @@ -20,9 +17,8 @@ class AlertList extends Component {
}

render () {
console.log(this.state.e)
return (
<ReactCSSTransitionGroup transitionName="transition" transitionEnterTimeout={500} transitionLeaveTimeout={800} className="alertList" >
<ReactCSSTransitionGroup transitionName="transition" transitionEnterTimeout={300} transitionLeaveTimeout={800} className="alertList">
{this.renderAlert(this.state.alertList)}
</ReactCSSTransitionGroup>
)
Expand Down
18 changes: 0 additions & 18 deletions src/scss/component-specific.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@
position:relative;
margin-top: 30px;
list-style:none;
//animation-name: openAlert;
//animation-duration: 0.3s;
background-color: #ffffff;
padding: $alert-padding;
}

.alertList {
position:fixed;
//width:35%;
right:0;
top:0;
margin-right:2%;
Expand All @@ -32,11 +29,6 @@ svg {
width: 0;
}

//@keyframes openAlert {
// 0% { top: -700px; }
// 100% { top: 0px; }
//}

.error-title {
color: #db0020;
}
Expand All @@ -62,18 +54,8 @@ svg {
list-style:none;
background-color: #ffffff;
padding: $alert-padding;
//animation-name: closeAlert;
//animation-duration: 1.2s;
}

//@keyframes closeAlert {
// 0% { right: 0px;}
// 100% { right: 1500px;}
//}


//=========================================

.transition-enter {
transform: translate(0,-250px);
transform: translate3d(0,-250px,0);
Expand Down
3 changes: 2 additions & 1 deletion test/__tests__/AlertList-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ describe('AlertList', () => {
});

it('should render the AlertList', function() {
expect(this.wrapper.node.type).toEqual('ul');
console.log(this.wrapper)
expect(this.wrapper.node.type).toEqual('Object');
});

it('should handle close', function() {
Expand Down

0 comments on commit 1ae5ad4

Please sign in to comment.