Merge "Include NotificationList in Login component"
This commit is contained in:
commit
3ae12da2fb
@ -14,9 +14,9 @@ export default AuthenticatedComponent(class Nodes extends React.Component {
|
||||
<NavBar/>
|
||||
</header>
|
||||
<div className="wrapper-fixed-body container-fluid">
|
||||
<NotificationList/>
|
||||
{this.props.children}
|
||||
</div>
|
||||
<NotificationList className="above-footer"/>
|
||||
<Footer/>
|
||||
</div>
|
||||
);
|
||||
|
@ -9,6 +9,7 @@ import KeystoneApiService from '../services/KeystoneApiService';
|
||||
import LoginActions from '../actions/LoginActions';
|
||||
import LoginStore from '../stores/LoginStore';
|
||||
import NotificationActions from '../actions/NotificationActions';
|
||||
import NotificationList from './ui/NotificationList';
|
||||
|
||||
export default class Login extends React.Component {
|
||||
constructor() {
|
||||
@ -124,6 +125,7 @@ export default class Login extends React.Component {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<NotificationList/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ export default class NotificationList extends React.Component {
|
||||
});
|
||||
|
||||
return (
|
||||
<div className="container-fluid notification-list">
|
||||
<div className={this.props.className + ' container-fluid notification-list'}>
|
||||
<div className="row">
|
||||
<div className="col-lg-6 col-sm-8 col-xs-12">
|
||||
{notifications.reverse()}
|
||||
@ -51,3 +51,9 @@ export default class NotificationList extends React.Component {
|
||||
);
|
||||
}
|
||||
}
|
||||
NotificationList.propTypes = {
|
||||
className: React.PropTypes.string
|
||||
};
|
||||
NotificationList.defaultProps = {
|
||||
className: ''
|
||||
};
|
||||
|
@ -1,10 +1,14 @@
|
||||
.notification-list {
|
||||
position: absolute;
|
||||
left:0;
|
||||
bottom: @footer-height;
|
||||
bottom: 0;
|
||||
z-index: 100;
|
||||
width: 100%;
|
||||
|
||||
&.above-footer {
|
||||
bottom: @footer-height;
|
||||
}
|
||||
|
||||
.alert {
|
||||
opacity: .95;
|
||||
transition: opacity .2s ease-in-out;
|
||||
|
Loading…
Reference in New Issue
Block a user