Tmp
This commit is contained in:
parent
5e963c6494
commit
9bc44bd65c
14 changed files with 153 additions and 132 deletions
|
@ -6,6 +6,11 @@
|
|||
|
||||
{% block media %}
|
||||
{% include "comments/media-css.html" %}
|
||||
<style>
|
||||
#page-container {
|
||||
background: white;
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
|
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
{% block media %}
|
||||
{% block content_media %}{% endblock %}
|
||||
<style>
|
||||
#page-container {
|
||||
background: white;
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block js_media %}
|
||||
|
|
|
@ -237,7 +237,7 @@
|
|||
</form>
|
||||
{% if active_participations %}
|
||||
<h4>{{ _('Active Contests') }}</h4>
|
||||
<table class="contest-list table striped">
|
||||
<table class="contest-list table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:90%">{{ _('Contest') }}</th>
|
||||
|
@ -291,7 +291,7 @@
|
|||
</button>
|
||||
</h4>
|
||||
<div id="ongoing-table">
|
||||
<table class="contest-list table striped">
|
||||
<table class="contest-list table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:90%">{{ _('Contest') }}</th>
|
||||
|
@ -330,7 +330,7 @@
|
|||
|
||||
<h4>{{ _('Upcoming Contests') }}</h4>
|
||||
{% if future_contests %}
|
||||
<table class="contest-list table striped">
|
||||
<table class="contest-list table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ _('Contest') }}</th>
|
||||
|
@ -368,7 +368,7 @@
|
|||
{% include "list-pages.html" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<table class="contest-list table striped">
|
||||
<table class="contest-list table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:90%">
|
||||
|
|
|
@ -2,18 +2,6 @@
|
|||
{% if (is_member or can_edit) %}
|
||||
{% include 'contests-countdown.html' %}
|
||||
{% endif %}
|
||||
{% if is_member or can_edit %}
|
||||
<div class="blog-sidebox sidebox">
|
||||
<h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
|
||||
<div class="sidebox-content">
|
||||
<div style="margin: 0.3em;">
|
||||
{% cache 3600 'organization_html' organization.id MATH_ENGINE %}
|
||||
{{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if can_edit or is_member %}
|
||||
<div id="control-panel" class="blog-sidebox sidebox no-dot-blog-sidebox">
|
||||
<h3>{{ _('Controls') }} <i class="fa fa-cog"></i></h3>
|
||||
|
@ -71,6 +59,16 @@
|
|||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
<div class="blog-sidebox sidebox">
|
||||
<h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
|
||||
<div class="sidebox-content">
|
||||
<div style="margin: 0.3em;">
|
||||
{% cache 3600 'organization_html' organization.id MATH_ENGINE %}
|
||||
{{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
|
||||
{% endcache %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include 'top-users.html' %}
|
||||
</div>
|
|
@ -260,7 +260,7 @@
|
|||
{% include "submission/submission-list-tabs.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block media %}
|
||||
{% block content_media %}
|
||||
{% if perms.judge.change_submission and perms.judge.rejudge_submission %}
|
||||
<style>
|
||||
td.sub-prop, col.sub-prop {
|
||||
|
|
|
@ -31,8 +31,7 @@
|
|||
})
|
||||
$('.blog-description').each(function() {
|
||||
if ($(this).prop('scrollHeight') > $(this).height() ) {
|
||||
$(this).parent().css('background-image', '-webkit-linear-gradient(bottom, gray, lightgray 3%, transparent 8%, transparent 100%)');
|
||||
$(this).parent().css('padding-bottom', '0');
|
||||
$(this).parent().addClass('pre-expand-blog');
|
||||
$(this).css('cursor', 'pointer');
|
||||
}
|
||||
});
|
||||
|
@ -43,8 +42,8 @@
|
|||
|
||||
{% macro make_tab_item(name, fa, url, text) %}
|
||||
<div class="left-sidebar-item {% if page_type == name %}active{% endif %}" data-href="{{ url }}" id="{{ name }}-tab">
|
||||
<div class="sidebar-icon"><i class="{{ fa }}"></i></div>
|
||||
{{ text }}
|
||||
<span class="sidebar-icon"><i class="{{ fa }}"></i></span>
|
||||
<span>{{ text }}</span>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block media %}
|
||||
{% block content_media %}
|
||||
<link href="http://fonts.cdnfonts.com/css/jersey-m54" rel="stylesheet">
|
||||
{% block users_media %}{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue