Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

minor layout formatting

Browse Source
This commit is contained in:
ivaosthu 2014-11-29 12:12:48 +01:00 committed by Ivar Conradi Østhus
parent 03c84c086c
commit 45ad98afbc
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/unleash.css
View File

@ -13,4 +13,8 @@
border-radius: 50%;
width: 20px;
height: 20px;
}
.no-border {
border: none;
}

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

@ -33,14 +33,11 @@ var Feature = React.createClass({
this.toggleEditMode();
},
render: function() {
return this.state.editMode ? this.renderEditMode() : this.renderViewMode();
},
renderEditMode: function() {
return (
<tr>
<td colSpan="5">
<td colSpan="5" className="pan man no-border">
<FeatureForm feature={this.props.feature} onSubmit={this.saveFeature} onCancel={this.toggleEditMode} />
</td>
</tr>
@ -48,10 +45,10 @@ var Feature = React.createClass({
},
renderViewMode: function() {
render: function() {
return (
<tbody>
<tr>
<tr className={this.state.editMode ? "edit bg-lilac-xlt" : ""}>
<td width="20">
<span className={this.props.feature.enabled ? "toggle-active" : "toggle-inactive"} title="Status">
</span>
@ -71,18 +68,19 @@ var Feature = React.createClass({
<td width="100">
<div className="line">
<div className="unit size1of2">
<button className="mrs mbs" type='button' title='Edit' onClick={this.toggleEditMode}>
<button className={this.state.editMode ? "primary" : ""} title='Edit' onClick={this.toggleEditMode}>
<span className="icon-redigere" />
</button>
</div>
<div className="unit size1of2">
<button type='button' title='History' onClick={this.toggleHistory}>
<button className={this.state.showHistory ? "primary" : ""} title='History' onClick={this.toggleHistory}>
<span className="icon-visning_liste" />
</button>
</div>
</div>
</td>
</tr>
{this.state.editMode ? this.renderEditMode() : this.renderEmptyRow()}
{this.state.showHistory ? this.renderHistory() : this.renderEmptyRow()}
</tbody>
);
@ -94,7 +92,9 @@ var Feature = React.createClass({
renderHistory: function() {
return (<tr>
<td colSpan="5"><LogEntryList events={this.state.events} /></td>
<td colSpan="5" className="pan man no-border">
<LogEntryList events={this.state.events} />
</td>
</tr>);
}

2
public/js/components/feature/FeatureForm.jsx
View File

@ -23,7 +23,7 @@ var FeatureForm = React.createClass({
enabled: false
};
var title = this.props.feature ? "Edit '" + this.props.feature.name + "'" : "Create new toggle";
var title = this.props.feature ? "" : "Create new toggle";
return (
<div className="bg-lilac-xlt r-pam">

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

@ -12,7 +12,7 @@ var LogEntryList = React.createClass({
});
return (
<div className='r-margin'>
<table className='outerborder'>
<table className='condensed outerborder zebra-striped'>
<thead>
<tr>
<th>When</th>