ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-23 12:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Standardise team label width

Browse source
This commit is contained in:
Chris Blanchard 2015-09-20 15:47:43 +01:00
parent 4b2cfa6f0f
commit b56a9a4aad
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/react/gather.jsx
View file

@ -12,18 +12,18 @@ var SelectPlayerButton = React.createClass({
let button; let button;
if (this.props.gatherer.leader) { if (this.props.gatherer.leader) {
button = <button button = <button
className="btn btn-xs btn-default" className="btn btn-xs btn-default team-label"
data-disabled="true">Leader</button>; data-disabled="true">Leader</button>;
} else if (this.props.gatherer.team !== "lobby") { } else if (this.props.gatherer.team !== "lobby") {
button = <button button = <button
data-disabled="true" data-disabled="true"
className="btn btn-xs btn-default"> {this.props.gatherer.team} className="btn btn-xs btn-default team-label"> {_.capitalize(this.props.gatherer.team)}
</button>; </button>;
} else { } else {
button = <button button = <button
onClick={this.selectPlayer} onClick={this.selectPlayer}
value={this.props.gatherer.id} value={this.props.gatherer.id}
className="btn btn-xs btn-primary"> Select className="btn btn-xs btn-primary team-label"> Select
</button>; </button>;
} }
return button; return button;
@ -717,9 +717,11 @@ var Gatherers = React.createClass({
); );
} else { } else {
if (gatherer.leader) { if (gatherer.leader) {
action = (<span className="label label-default">Leader</span>); action = (<span className="label label-primary team-label">Leader</span>);
} else if (gatherer.team !== "lobby") { } else if (gatherer.team !== "lobby") {
action = (<span className="label label-primary">{_.capitalize(gatherer.team)}</span>); action = (<span className="label label-primary team-label">{_.capitalize(gatherer.team)}</span>);
} else {
action = (<span className="label label-default team-label">Lobby</span>);
} }
} }
} }

14
public/css/app.css
View file

@ -49,6 +49,16 @@ html, body {
/*Gather Styles*/ /*Gather Styles*/
.vote-button {
min-width: 60px;
}
.team-label {
min-width: 70px;
display: inline-block;
padding: 5px;
}
.lifeform-icon { .lifeform-icon {
width: 20px; width: 20px;
margin: 0 3px; margin: 0 3px;
@ -127,7 +137,3 @@ html, body {
.panel-light-background { .panel-light-background {
background-color: #d9edf7; background-color: #d9edf7;
} }
.vote-button {
min-width: 60px;
}