JohnHammond
/
ColdCore
mirror of https://github.com/JohnHammond/ColdCore.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of styles

master
Glitch 2016-07-12 18:37:25 +00:00
parent 754f07be1b
commit 507ea9dd13
4 changed files with 186 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
static/css/main.css
View File

@ -99,6 +99,22 @@ body {
padding-right: 14px;
}
.page-title
{
font-weight: 300;
font-size: 3.2rem;
display: inline-block;
margin-left: -3px;
padding-right: 0.5rem;
padding-left: 0.5rem;
}
.page-title-tag
{
font-size: 3.2rem;
display: inline-block;
}
.form-title
{
font-weight: 300;
@ -131,6 +147,15 @@ body {
margin: 30px;
}
.card-header {
color: white;
padding: 1rem;
padding-top: 1.5rem;
padding-bottom: 0.5rem;
font-size: 2rem;
font-weight: 300;
}
/* MEDIUM */
@media only screen and (max-width : 992px) {
.cont {

2
templates/base.html
View File

@ -77,7 +77,7 @@
{% if logged_in %}
<li><a href="{{ url_for('team_dashboard') }}">
<div class="side-icon"><i class="material-icons teal-text">track_changes</i></div>
<div class="side-icon"><i class="material-icons indigo-text">track_changes</i></div>
<div class="side-text">My Team</div>
</a></li>
<li><a href="{{ url_for('user_dashboard') }}">

42
templates/team.html
View File

@ -30,7 +30,10 @@
</style>
{% endblock %}
{% block content %}
<h2>{{ team.name }}</h2>
<div class="page-title-wrapper">
<div class="page-title-tag indigo indigo-text">_</div>
<div class="page-title white">{{ team.name }}</div>
</div>
<section>
<div class="row">
<div class="col s12">
@ -43,15 +46,23 @@
</div>
</div>
</section>
<section>
<h4>Team information</h4>
<div class="row">
<div class="col s12 m6">
<div class="card">
<div class="card-header teal">
Team
</div>
<div class="card-content">
<p>Your score is currently {{ team_score }}. <a href="{{ url_for('challenges') }}">Go solve more challenges!</a></p>
<p>Your team email is <code>{{ team.email }}</code>, and you are affiliated with
{{ team.affiliation }}.</p>
<p>Your team is currently marked {{ "eligible" if team.eligible() else "ineligible" }}.</p>
</section>
<section>
<h4>Edit information</h4>
</div>
</div>
</div>
<div class="col s12 m6">
<div class="card">
<div class="card-header purple">Edit Information</div>
<div class="card-content">
<form method="POST">
<div class="input-field">
<label for="team-name">Team Name</label>
@ -63,11 +74,16 @@
</div>
<input name="_csrf_token" type="hidden" value="{{ csrf_token() }}" />
<br /><br />
<button class="btn waves-effect waves-light" type="submit">Update team</button>
<button class="btn waves-effect waves-light right" type="submit">Update</button>
</form>
</section>
<section>
<h4>Score calculation</h4>
</div>
</div>
</div>
</div>
<div class="row">
<div class="card">
<div class="card-header orange">Score Calculation</div>
<div class="card-content">
{% if team_solves.count() %}
<h5>Solved problems</h5>
<div class="row">
@ -113,5 +129,7 @@
{% else %}
<p>No score adjustments have been made.</p>
{% endif %}
</section>
</div>
</div>
</div>
{% endblock %}

18
templates/user.html
View File

@ -30,7 +30,11 @@
</style>
{% endblock %}
{% block content %}
<h2>{{ user.username }}</h2>
<div class="page-title-wrapper">
<div class="page-title-tag teal teal-text">_</div>
<div class="page-title white">{{ user.username }}</div>
</div>
{% if not user.email_confirmed %}
<div class="row">
<div class="col s12">
@ -52,8 +56,9 @@
</div>
</div>
{% endif %}
<section>
<h4>Edit information</h4>
<div class="card">
<div class="card-header purple">Edit Information</div>
<div class="card-content">
<form method="POST">
<div class="row no-bot">
<div class="input-field col s12">
@ -113,13 +118,12 @@
</div>
</div>
<div class="row no-bot">
<div class="col s12 m6">
<button class="btn waves-effect waves-light right register-submit" type="submit">Update information</button>
</div>
<button class="btn waves-effect waves-light right register-submit" type="submit">Update</button>
</div>
<input name="_csrf_token" type="hidden" value="{{ csrf_token() }}" />
</form>
</section>
</div>
</div>
<div id="firstlogin" class="modal">
<div class="modal-content">
<h4>Welcome to {{ config.ctf_name }}!</h4>