Skip to content

[style] updates colors of login/register/join game buttons #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickyeh merged 6 commits into from
Apr 5, 2016
Merged

[style] updates colors of login/register/join game buttons #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33ccd4b
[style] updates colors of login/register/join game buttons to light o…
marksanghoonkim Apr 4, 2016
7f258af
Merge branch 'dev' of https://github.com/nimblecode/nimblecode into f…
marksanghoonkim Apr 4, 2016
94c6779
Merge branch 'dev' of https://github.com/nimblecode/nimblecode into f…
marksanghoonkim Apr 4, 2016
8c1b7f5
[feat] updates autocomplete with a slight 100 ms delay
marksanghoonkim Apr 4, 2016
bcca51b
[style] updates orange buttons to slightly darker
marksanghoonkim Apr 4, 2016
1a447db
[cleanup] removes unneeded library file
marksanghoonkim Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions client/components/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ class Login extends Component {
<form className="form col-sm-6 col-sm-offset-3" onSubmit={this._onSubmit.bind(this)}>
<div className="form-group label-floating">
<label htmlFor="username" className="control-label">Username</label>
<input type="text" id="username" className="form-control" value={this.state.username} onChange={this._changeUsername.bind(this)} />
<input
type="text"
id="username"
className="form-control"
value={this.state.username}
onChange={this._changeUsername.bind(this)} />
</div>

<div className="form-group label-floating">
Expand All @@ -42,7 +47,7 @@ class Login extends Component {

<center>
<div className="row">
<button className="btn btn-raised" type="submit">Login</button>
<button id="login-register-btn" className="oj-btn btn btn-raised" type="submit">Login</button>
<br />
<div className="row text-center">{this.state.passwordFail ? ( <p className="failed-validation">Wrong password, fam.</p> ) : null }
{this.state.usernameFail ? ( <p className="failed-validation">Username doesn't exist. Please register an account with us.</p> ) : null }
Expand Down
2 changes: 1 addition & 1 deletion client/components/Register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Register extends Component {
<input id="password" type="password" className="form-control" value={this.state.password} onChange={this._changePassword.bind(this)} />
</div>
<center>
<button className="btn btn-raised" type="submit">Sign Up</button>
<button id="login-register-btn" className="oj-btn btn btn-raised" type="submit">Sign Up</button>
<br />
<div className="row text-center"> {this.state.usernameExists ? (
<p className="failed-validation">Username is taken already! Please use a different one.</p>
Expand Down
6 changes: 4 additions & 2 deletions client/containers/CodeEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ class CodeEditor extends Component {
fontSize: '11pt',
minLines: 12,
maxLines: 12,
enableBasicAutocompletion: true,
enableBasicAutocompletion: false,
enableSnippets: false,
enableLiveAutocompletion: false
enableLiveAutocompletion: true,
liveAutocompletionDelay: 100,
liveAutocompletionThreshold: 2
});

// autocomplete tries to fire on every input
Expand Down
6 changes: 4 additions & 2 deletions client/containers/CodeEditorMulti.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ class CodeEditorMulti extends Component {
fontSize: '11pt',
minLines: 12,
maxLines: 12,
enableBasicAutocompletion: true,
enableBasicAutocompletion: false,
enableSnippets: false,
enableLiveAutocompletion: false
enableLiveAutocompletion: true,
liveAutocompletionDelay: 100,
liveAutocompletionThreshold: 2
});

// autocomplete tries to fire on every input
Expand Down
32 changes: 25 additions & 7 deletions client/containers/LandingPageMulti.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,36 @@ class LandingPageMulti extends Component {
<div className="col-sm-12 text-center">

<center>
<button type="button" onClick={this.handleSubmitPublic.bind(this)} className="btn btn-raised btn-primary landing-btn">Join Public Room</button>
<button
id="join-multi-btn"
type="button"
onClick={this.handleSubmitPublic.bind(this)}
className="oj-btn btn btn-raised landing-btn">
Join Public Room
</button>
</center>

<h2 className="text-center"><strong>--- OR ---</strong></h2>

<center><form className="form-inline" onSubmit={this.handleSubmitPrivate.bind(this)}>
<div className="form-group label-floating">
<label htmlFor="roomId" className="control-label">Room ID (Number)</label>
<input type="number" id="roomId" className="form-control text-center" value={this.state.privateRoomId} onChange={this.changePrivateRoomId.bind(this)} />
<center>
<form className="form-inline" onSubmit={this.handleSubmitPrivate.bind(this)}>
<div className="form-group label-floating">
<label htmlFor="roomId" className="control-label">Room ID (Number)</label>
<input
type="number"
id="roomId"
className="form-control text-center"
value={this.state.privateRoomId}
onChange={this.changePrivateRoomId.bind(this)} />
</div>
</form>
<button type="button" onClick={this.handleSubmitPrivate.bind(this)} className="btn btn-raised btn-primary landing-btn">Create/Join Private Room</button>
</form>
<button
id="join-multi-btn"
type="button"
onClick={this.handleSubmitPrivate.bind(this)}
className="oj-btn btn btn-raised landing-btn">
Create/Join Private Room
</button>
</center>
</div>
</div>
Expand Down
1,955 changes: 1,954 additions & 1 deletion client/lib/ace/src-min/ext-language_tools.js
View file
Open in desktop

Large diffs are not rendered by default.

63 changes: 58 additions & 5 deletions client/styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ html, body {
}

.landing-btn{
color: #565656;
margin: 10px;
}

Expand Down Expand Up @@ -171,14 +172,67 @@ html, body {
#start-btn {
z-index: 10;
color: #444;
background-color: #FFA25E;
background-color: #FFA25E;
}

#menu1{
#start-btn:active {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#start-btn:hover {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#login-register-btn {
z-index: 10;
color: #444;
background-color: #FFA25E;
}

#login-register-btn:active {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#login-register-btn:hover {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#join-multi-btn {
z-index: 10;
color: #444;
background-color: #FFA25E;
}

#join-multi-btn:active {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#join-multi-btn:hover {
z-index: 10;
color: #444;
background-color: #FFB37B !important;
}

#menu1 {
color: white;
background-color: #009688;
}

#menu1:hover {
color: white;
background-color: #20A294;
}

#level-display-container {
height: 0px;
}
Expand Down Expand Up @@ -221,16 +275,15 @@ html, body {
.oj-btn:active {
z-index: 10;
color: #444;
background-color: #FFA666 !important;
background-color: #FFB37B !important;
}

.oj-btn:hover {
z-index: 10;
color: #444;
background-color: #FFA666 !important;
background-color: #FFB37B !important;
}


.teal-btn {
z-index: 10;
color: #444;
Expand Down