Update list design

This commit is contained in:
cyril lopez 2017-08-08 16:51:02 +02:00
parent 9da55f6194
commit f16b26b631
5 changed files with 42 additions and 19 deletions

View File

@ -97,7 +97,7 @@ class List extends React.Component { // eslint-disable-line react/prefer-statele
<div className={styles.titleContainer}> <div className={styles.titleContainer}>
{this.props.listTitle} {this.props.listTitle}
</div> </div>
<div> <div className={styles.buttonContainer}>
{button} {button}
</div> </div>
</div> </div>

View File

@ -1,10 +1,10 @@
.listContainer { /* stylelint-disable */ .listContainer { /* stylelint-disable */
margin-right: 15px; // margin-right: 15px;
} }
.listSubContainer { .listSubContainer {
margin: 0 3.3rem; margin: 0 3.3rem;
padding: 1rem 3rem 5.8rem 3rem; padding: 1rem 2.8rem 5.8rem 2.8rem;
border-radius: 0.2rem; border-radius: 0.2rem;
background-color: #FFFFFF; background-color: #FFFFFF;
// background-color: red; // background-color: red;
@ -31,9 +31,11 @@
padding-top: .5rem; padding-top: .5rem;
> ul { > ul {
list-style: none; list-style: none;
padding: 0 2.7rem 0 1rem; padding: 0 1.7rem 0 1rem;
> li { > li {
margin-bottom: 3.3rem;
padding-top: .3rem;
line-height: 1.6rem;
} }
} }
} }
@ -58,9 +60,10 @@
.label { .label {
width: 20rem; width: 20rem;
margin-left: 5.2rem; margin-left: 5rem;
color: #333740; color: #333740;
font-weight: 600; font-weight: 600;
} }
.capitalized { .capitalized {
@ -68,16 +71,18 @@
} }
.centered { .centered {
width: 25rem; width: 20rem;
text-align: right; text-align: right;
} }
.italicText { .italicText {
font-family: Lato;
color: #49515A; color: #49515A;
font-style: italic; font-style: italic;
} }
.normal { .normal {
font-family: Lato;
color: #1C5DE7; color: #1C5DE7;
padding-top: 0rem; padding-top: 0rem;
} }
@ -184,3 +189,19 @@
.leftSpaced { .leftSpaced {
margin-left: 1rem; margin-left: 1rem;
} }
.buttonContainer {
> button {
margin-right: 0;
}
}
.trashContainer {
margin-left: 4rem;
}
.spacer {
height: 1.6rem;
margin-bottom: 1.6rem;
border-bottom: 1px solid rgba(14,22,34,0.04);
}

View File

@ -18,14 +18,13 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
super(props); super(props);
this.state = { this.state = {
modal: false, modal: false,
databaseName: '',
warning: false, warning: false,
}; };
} }
showDatabaseModal = ({ target }) => { showDatabaseModal = () => {
this.setState({ modal: !this.state.modal, databaseName: target.id }); this.setState({ modal: !this.state.modal });
this.props.getDatabase(target.id); this.props.getDatabase(this.props.data.name);
} }
toggle = () => { toggle = () => {
@ -36,7 +35,7 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
handleSubmit = (e) => { handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
this.props.handleSubmit(this.state.databaseName); this.props.handleSubmit(this.props.data.name);
this.setState({ modal: !this.state.modal }); this.setState({ modal: !this.state.modal });
} }
@ -49,17 +48,17 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
return ( return (
<li> <li>
<div className={styles.flexLi}> <div className={styles.flexLi}>
<div className={styles.flexed}> <div className={styles.flexed} onClick={this.showDatabaseModal} style={{ cursor: 'pointer' }}>
<div className={styles.squared} style={{ backgroundColor: this.props.data.color }}> <div className={styles.squared} style={{ backgroundColor: this.props.data.color }}>
{this.props.data.letter} {this.props.data.letter}
</div> </div>
<div className={styles.label}>{this.props.data.name}</div> <div className={styles.label}>{this.props.data.name}</div>
</div> </div>
<div>{this.props.data.database}</div> <div onClick={this.showDatabaseModal} style={{ cursor: 'pointer' }}>{this.props.data.database}</div>
<div className={styles.centered}>{this.props.data.host}</div> <div className={styles.centered} style={{ width: '15rem', cursor: 'pointer'}} onClick={this.showDatabaseModal}>{this.props.data.host}</div>
<div className={styles.flexed}> <div className={styles.flexed} style={{ width: '4rem', justifyContent: 'space-between'}}>
<div><i className="fa fa-pencil" onClick={this.showDatabaseModal} id={this.props.data.name} /></div> <div><i className="fa fa-pencil" style={{ cursor: 'pointer' }} onClick={this.showDatabaseModal} id={this.props.data.name} /></div>
<div className={styles.leftSpaced}><i id={this.props.data.name} className="fa fa-trash" onClick={this.toggleWarning} /></div> <div className={styles.leftSpaced}><i id={this.props.data.name} className="fa fa-trash" onClick={this.toggleWarning} /></div>
</div> </div>
</div> </div>
@ -97,6 +96,7 @@ class RowDatabase extends React.Component { // eslint-disable-line react/prefer-
warningMessage={'popUpWarning.databases.delete.message'} warningMessage={'popUpWarning.databases.delete.message'}
/> />
</div> </div>
<div className={styles.spacer} />
</li> </li>
); );
} }

View File

@ -60,7 +60,7 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
</div> </div>
<div>{this.props.name}</div> <div>{this.props.name}</div>
<div className={this.props.liStyles.centered}>{languageLabel}</div> <div className={this.props.liStyles.centered}>{languageLabel}</div>
<div>{deleteIcon}</div> <div className={this.props.liStyles.trashContainer}>{deleteIcon}</div>
</div> </div>
<div> <div>
<PopUpWarning <PopUpWarning
@ -70,6 +70,8 @@ class RowLanguage extends React.Component { // eslint-disable-line react/prefer-
warningMessage={'popUpWarning.languages.delete.message'} warningMessage={'popUpWarning.languages.delete.message'}
/> />
</div> </div>
<div className={this.props.liStyles.spacer} />
</li> </li>
); );
} }

View File

@ -299,7 +299,7 @@ export class Home extends React.Component { // eslint-disable-line react/prefer-
valueComponent={this.valueComponent} valueComponent={this.valueComponent}
optionComponent={this.optionComponent} optionComponent={this.optionComponent}
clearable={false} clearable={false}
searchable={false}
/> />
</div> </div>
) )