ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-10 07:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restyled

Browse source
This commit is contained in:
Chris Blanchard 2015-09-14 23:14:36 +01:00
parent 7005c58082
commit 7bd06a5131
4 changed files with 31 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/react/gather.jsx
View file

@ -359,13 +359,17 @@ var GatherActions = React.createClass({
} }
return ( return (
<div className="gather-actions text-right"> <div className="panel panel-default gather-actions">
<ul className="list-inline no-bottom"> <div className="panel-body">
<TeamSpeakButton /> <div className="text-right">
{confirmTeam} <ul className="list-inline no-bottom">
{inviteButton} <TeamSpeakButton />
{joinButton} {confirmTeam}
</ul> {inviteButton}
{joinButton}
</ul>
</div>
</div>
</div> </div>
); );
} }
@ -598,8 +602,12 @@ var Gather = React.createClass({
} }
return ( return (
<div> <div>
<h3 className="headline">Current Gather</h3> <div className="panel panel-default">
<GatherProgress {...this.props} /> <div className="panel-heading">Current Gather</div>
<div className="panel-body">
<GatherProgress {...this.props} />
</div>
</div>
<Gatherers {...this.props} /> <Gatherers {...this.props} />
{gatherTeams} {gatherTeams}
{voting} {voting}

16
public/css/app.css
View file

@ -2,20 +2,18 @@ html, body {
height: 100%; height: 100%;
} }
.gather-actions {
padding: 10px 0px;
border-top: 1px solid #CFCFCF;
margin-top: 1em;
}
.headline { .headline {
padding-bottom: 0.5em; padding-bottom: 0.5em;
border-bottom: 1px solid #CFCFCF; border-bottom: 1px solid #CFCFCF;
margin-bottom: 20px; margin-bottom: 20px;
} }
.gather-actions {
margin-top: 0.5em;
}
#gathers { #gathers {
margin-top: 2em; margin-top: 1em;
} }
.gatherer { .gatherer {
@ -24,7 +22,7 @@ html, body {
} }
#chatroom { #chatroom {
margin-top: 20px; margin-top: 1em;
} }
.chatbox { .chatbox {
@ -62,7 +60,7 @@ html, body {
} }
.add-top { .add-top {
margin-top: 10px; margin-top: 0.5em;
} }
.previous-headline { .previous-headline {

15
views/index.hbs
View file

@ -1,10 +1,10 @@
<div id="wrapper"> <div id="wrapper">
{{>menu}} {{>menu}}
<div id="page-wrapper" style="min-height: 750px;"> <div style="min-height: 750px;">
<div class="container-fluid"> <div class="container-fluid">
<div class="row" id="authenticating"> <div class="row" id="authenticating">
<div class="col-lg-6 col-lg-offset-3"> <div class="col-lg-6 col-lg-offset-3">
<div class="jumbotron jumbo-auth text-center"> <div class="add-top jumbotron jumbo-auth text-center">
<div> <div>
<img src="/images/ensl_logo.png" class="jumbo-img" alt="ENSL Logo" /> <img src="/images/ensl_logo.png" class="jumbo-img" alt="ENSL Logo" />
</div> </div>
@ -19,7 +19,7 @@
</div> </div>
<div class="row" id="gather-banned" style="display:none;"> <div class="row" id="gather-banned" style="display:none;">
<div class="col-lg-6 col-lg-offset-3"> <div class="col-lg-6 col-lg-offset-3">
<div class="jumbotron jumbo-auth text-center"> <div class="add-top jumbotron jumbo-auth text-center">
<div> <div>
<img src="/images/ensl_logo.png" alt="ENSL Logo" /> <img src="/images/ensl_logo.png" alt="ENSL Logo" />
</div> </div>
@ -32,7 +32,7 @@
</div> </div>
<div class="row" id="auth-required" style="display:none;"> <div class="row" id="auth-required" style="display:none;">
<div class="col-lg-6 col-lg-offset-3"> <div class="col-lg-6 col-lg-offset-3">
<div class="jumbotron jumbo-auth text-center"> <div class="add-top jumbotron jumbo-auth text-center">
<div> <div>
<img src="/images/ensl_logo.png" alt="ENSL Logo" /> <img src="/images/ensl_logo.png" alt="ENSL Logo" />
</div> </div>
@ -44,12 +44,11 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-3 col-md-6" id="gatherCounter"> <div class="col-lg-1">
<ul class="nav" id="side-menu"></ul>
</div> </div>
</div> <div class="col-lg-5" id="chatroom"></div>
<div class="row">
<div class="col-lg-6" id="gathers"></div> <div class="col-lg-6" id="gathers"></div>
<div class="col-lg-6" id="chatroom"></div>
</div> </div>
</div> </div>
</div> </div>

12
views/partials/menu.hbs
View file

@ -1,11 +1,5 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0"> <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">ENSL.org Gathers <strong>Alpha</strong></a> <a class="navbar-brand" href="/">ENSL.org Gathers <strong>Alpha</strong></a>
</div> </div>
@ -13,10 +7,4 @@
</ul> </ul>
<ul class="nav navbar-top-links navbar-right" id="soundcontroller"> <ul class="nav navbar-top-links navbar-right" id="soundcontroller">
</ul> </ul>
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu"></ul>
</div>
</div>
</nav> </nav>