Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

Fixed presentation and formatting of toggles and log-entries

Browse Source
This commit is contained in:
ivaosthu 2014-12-11 08:19:31 +01:00 committed by Ivar Conradi Østhus
parent 32125ca4fb
commit 6bfde35de0
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -20,7 +20,7 @@
"start": "NODE_ENV=production node server.js",
"build": "./node_modules/.bin/webpack",
"dev": "NODE_ENV=development supervisor --ignore ./node_modules/,./public/js server.js",
"test": "export PORT=4243 ; jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/*.js && npm run coverage",
"test": "export PORT=4243 ; jest && jshint server.js lib test && jsxhint public/js/**/*.jsx && mocha test test/*.js && npm run coverage",
"tdd": "mocha --watch test test/*",
"test-bamboo-ci": "mocha test test/*",
"coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec",

3
public/css/unleash.css
View File

@ -20,5 +20,6 @@
}
code {
word-wrap: break-word;;
word-wrap: break-word;
white-space: pre;
}

15
public/js/components/feature/Feature.jsx
View File

@ -37,7 +37,7 @@ var Feature = React.createClass({
renderEditMode: function() {
return (
<tr>
<td colSpan="5" className="pan man no-border">
<td colSpan="4" className="pan man no-border">
<FeatureForm feature={this.props.feature} onSubmit={this.saveFeature} onCancel={this.toggleEditMode} />
</td>
</tr>
@ -54,18 +54,17 @@ var Feature = React.createClass({
</span>
</td>
<td>
{this.props.feature.name}
</td>
<td className='opaque smalltext word-break' width="600">
{this.props.feature.description || '\u00a0'}
{this.props.feature.name} <br />
<span className="opaque smalltext word-break">
{this.props.feature.description || '\u00a0'}
</span>
</td>
<td>
{this.props.feature.strategy}
</td>
<td width="100">
<td width="110">
<div className="line">
<div className="unit size1of2">
<button className={this.state.editMode ? "primary" : ""} title='Edit' onClick={this.toggleEditMode}>
@ -92,7 +91,7 @@ var Feature = React.createClass({
renderHistory: function() {
return (<tr>
<td colSpan="5" className="no-border">
<td colSpan="4" className="no-border">
<LogEntryList events={this.state.events} />
</td>
</tr>);

1
public/js/components/feature/FeatureList.jsx
View File

@ -19,7 +19,6 @@ var FeatureList = React.createClass({
<tr>
<th></th>
<th>Name</th>
<th>Description</th>
<th>Strategy</th>
<th></th>
</tr>

2
public/js/components/log/LogEntry.jsx
View File

@ -20,7 +20,7 @@ var LogEntry = React.createClass({
<strong>{this.props.event.data.name}</strong><em>[{this.props.event.type}]</em>
</td>
<td style={{maxWidth: 300}}>
<code className='JSON smalltext'>{JSON.stringify(localEventData)}</code>
<code className='JSON smalltext man'>{JSON.stringify(localEventData, null, 2)}</code>
</td>
<td>{this.props.event.createdBy}</td>
</tr>