technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 18:12:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'marietje-zuid' into 'marietje-zuid'

Browse Source 
stats: show equal height columns

See merge request dsprenkels/MarietjeDjango!47
This commit is contained in:
Gerdriaan Mulder
2020-03-28 15:46:47 +01:00
parent 6a549fbd7b 62ba17ef67
commit 228d0208f2
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
marietje/marietje/static/css/custom.css
View File

@ -49,3 +49,13 @@ tr.requested_song{
background-color: #f9f9f9;
border-bottom: 2px solid #777777;
}
/* Bootstrap 3 doesn't support equal height columns, hack via <https://medium.com/wdstack/bootstrap-equal-height-columns-d07bc934eb27#892f> */
.row.display-flex {
display: flex;
flex-wrap: wrap;
}
.row.display-flex > [class*='col-'] {
display: flex;
flex-direction: column;
}

6
marietje/stats/templates/stats/stats.html
View File

@ -5,14 +5,14 @@
{% block content %}
<h1>Statistics</h1>
<div class="row">
<div class="row display-flex">
{% if not stats %}
<div class="alert alert-danger">
<div class="col-md-12 alert alert-danger">
<strong>Stats unavailable :(</strong>
</div>
{% else %}
{% if current_age_text %}
<div class="alert alert-info">
<div class="col-md-12 alert alert-info">
<strong>{{ current_age_text }}</strong>
{% endif %}
</div>

6
marietje/stats/templates/stats/user.html
View File

@ -7,14 +7,14 @@
{% block content %}
<h1>User Statistics</h1>
<div class="row">
<div class="row display-flex">
{% if not stats %}
<div class="alert alert-danger">
<div class="col-md-12 alert alert-danger">
<strong>Stats unavailable :(</strong>
</div>
{% else %}
{% if current_age_text %}
<div class="alert alert-info">
<div class="col-md-12 alert alert-info">
<strong>{{ current_age_text }}</strong>
{% endif %}
</div>