Commit 444a7a19 authored by Luko van der Maas's avatar Luko van der Maas
Browse files

Merge branch 'tc/new-template-improvements' into 'master'

Fix some styling for new template

See merge request thalia/concrexit!1002
parents aa002a43 79d4182a
......@@ -71,7 +71,7 @@
<i>({{ event.max_participants }} {% trans "max" %})</i>
{% with prc=registration_percentage %}
<div class="progress mt-1">
<div class="progress-bar" style="width: {{ prc|floatformat:"0" }}%"></div>
<div class="progress-bar progress{{ prc|floatformat:"0" }}"></div>
</div>
{% endwith %}
{% endif %}
......
......@@ -5,7 +5,7 @@
<div class="auto-lists-info">
<h2>{% trans "Automatically generated mailing lists" %}</h2>
<div class="results">
<table id="result_list" style="width:100%">
<table id="result_list">
<thead>
<tr>
<th>
......
......@@ -72,9 +72,9 @@
<br>
{% for period in achievement.periods %}
{% if period.role %}
<span style="text-transform:inherit;">{{ period.role }}: </span>
<span>{{ period.role }}: </span>
{% elif period.chair %}
<span style="text-transform:inherit;">{% trans "Chair" %}: </span>
<span>{% trans "Chair" %}: </span>
{% endif %}
<i>{% if period.since|date:'Y m d' == '1970 01 01' %}?{% else %}
{{ period.since }}{% endif %} -
......
......@@ -9,5 +9,11 @@
-moz-border-radius: 0;
border-radius: 0;
background-color: $preset;
@for $i from 1 through 100 {
&.progress#{$i} {
width: #{percentage($i/100)};
}
}
}
}
#accentbar {
background: $preset;
height: 5px;
position: relative;
z-index: 1020;
}
.navbar {
font-size: 16px;
background-color: $white;
border-bottom: 1px solid $grey;
top: 5px;
> .container {
justify-content: end;
......@@ -97,13 +98,13 @@
#page-header {
height: 360px;
overflow: hidden;
display: flex;
justify-content: center;
.image {
width: 100%;
width: auto;
height: 100%;
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
max-width: none;
}
}
......
......@@ -43,13 +43,17 @@
{% if request.member and request.member.current_membership is None %}
<div class="announcement">
<i class="fas fa-id-card"></i>
<p><a href="{% url 'registrations:renew' %}">{% trans "You're currently not a member of Thalia. Renew your membership to get access to all parts of the website." %}</a></p>
<p>
<a href="{% url 'registrations:renew' %}">
{% trans "You're currently not a member of Thalia. Renew your membership to get access to all parts of the website." %}
</a>
</p>
</div>
{% endif %}
{% include "announcements/announcement.html" with announcements=announcements %}
</section>
<div id="accentbar"></div>
<div id="accentbar" class="sticky-top"></div>
<nav class="navbar navbar-expand-lg sticky-top">
<div class="container">
......@@ -100,11 +104,7 @@
<header id="page-header">
{% block header_image_container %}
<div
class="image"
style="background-image: url('{% block header_image %}{% pick_header_image %}{% endblock header_image %}')"
>
</div>
<img src="{% block header_image %}{% pick_header_image %}{% endblock header_image %}" class="image" />
{% endblock header_image_container %}
</header>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment