diff --git a/src/react/LogMonitor.js b/src/react/LogMonitor.js index 904d61b5..ec3dc0dc 100644 --- a/src/react/LogMonitor.js +++ b/src/react/LogMonitor.js @@ -2,7 +2,7 @@ import React, { PropTypes, findDOMNode } from 'react'; import LogMonitorEntry from './LogMonitorEntry'; if(BROWSER){ - require("./timeline.less"); + require("./LogMonitorEntries.less"); } export default class LogMonitor { constructor() { @@ -138,7 +138,7 @@ export default class LogMonitor { -
+ + + {JSON.stringify(action, null, 2)} + ++ ); + + // State + let stateComponent = !maximizedState ? ( +
+ + {this.printState(state, error)} ++ ); return ( -
- - - {JSON.stringify(action, null, 2)} - -) - } + this.setState({maximizedAction: !maximizedAction})} href="javascript:;"> + {headingComponent} - - {!maximizedBody ? - (
- - {this.printState(state, error)} -) - } + this.setState({maximizedState: !maximizedState})} href="javascript:;"> + {stateComponent}
- 0) ? 'pointer' : 'default', - WebkitUserSelect: 'none' - }}> - {JSON.stringify(action, null, 2)} - - - {!collapsed && -- ); } } function getTimestring(d) { diff --git a/src/react/timeline.less b/src/react/timeline.less deleted file mode 100644 index 6fc3b49c..00000000 --- a/src/react/timeline.less +++ /dev/null @@ -1,87 +0,0 @@ -.redux-timeline { - list-style: none; - padding: 20px 0 20px; - position: relative; -} - -.redux-timeline-pre { - background-color: transparent; - color: white; - border: 0; - margin: 0; - padding: 0; -} - -.redux-timeline > li { - margin-bottom: 20px; - position: relative; -} - -.redux-timeline > li:before, -.redux-timeline > li:after { - content: " "; - display: table; -} - -.redux-timeline > li:after { - clear: both; -} - -.redux-timeline > li:before, -.redux-timeline > li:after { - content: " "; - display: table; -} - -.redux-timeline > li:after { - clear: both; -} - -.redux-timeline > li > .redux-timeline-panel { - width: 100%; - float: left; - border: 1px solid #d4d4d4; - border-radius: 2px; - padding: 5px; - position: relative; - -webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175); - box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175); -} - -.redux-timeline > li.redux-timeline-inverted > .redux-timeline-panel { - float: right; -} - -.redux-timeline-badge.primary { - background-color: #2e6da4 !important; -} - -.redux-timeline-badge.success { - background-color: #3f903f !important; -} - -.redux-timeline-badge.warning { - background-color: #f0ad4e !important; -} - -.redux-timeline-badge.danger { - background-color: #d9534f !important; -} - -.redux-timeline-badge.info { - background-color: #5bc0de !important; -} - -.redux-timeline-title { - margin-top: 0; - //color: inherit; -} - -.redux-timeline-body > p, -.redux-timeline-body > ul { - margin-bottom: 0; -} - -.redux-timeline-body > p + p { - margin-top: 5px; -}- ⇧ -
- } - - {!collapsed && -- {this.printState(state, error)} -- } - -
-