Skip to content
Snippets Groups Projects
Commit 48c5e565 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '109-css-for-week-timetable-and-dashboard-widget-broken' into 'master'

Resolve "CSS for week timetable and dashboard widget broken"

Closes #109

See merge request !130
parents 13e599ee 7f853e35
No related branches found
No related tags found
1 merge request!130Resolve "CSS for week timetable and dashboard widget broken"
Pipeline #5943 passed
<div class="card lesson-card {% if week_day == active_day %} z-depth-5 active {% endif %}"> <div class="card lesson-card {% if active_day and week_day == active_day %} z-depth-5 active {% endif %}">
<div class="card-content"> <div class="card-content">
{% for element in elements %} {% for element in elements %}
{% if element.label_ == "lesson_period" %} {% if element.label_ == "lesson_period" %}
......
{% load i18n %} {% load i18n %}
<div class="card lesson-card supervision-card"> <div class="card lesson-card supervision-card {% if active_day and week_day == active_day %} z-depth-5 active {% endif %}">
<div class="card-content"> <div class="card-content">
{% if supervision %} {% if supervision %}
<div style=" <div style="
......
{# Week days #} {# Week days #}
<div class="row"> <div class="row">
<div class="col s1"> <div class="col {% if active_day %}s1{% else %}s2{% endif %}">
</div> </div>
{# Show short weekdays on tablets #} {# Show short weekdays on tablets #}
{% for weekday in weekdays_short %} {% for weekday in weekdays_short %}
<div class="col s2 hide-on-large-only"> <div class="col s2 hide-on-large-only">
<div class="card timetable-title-card"> <div class="card timetable-title-card {% if active_day and weekday.date == active_day %} z-depth-5 {% endif %}">
<div class="card-content"> <div class="card-content">
<span class="card-title"> <span class="card-title">
{{ weekday.name }} {{ weekday.name }}
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
{# Show long weekdays elsewere #} {# Show long weekdays elsewere #}
{% for weekday in weekdays %} {% for weekday in weekdays %}
<div class="col {% if weekday.date == active_day %} s3 {% else %} s2 {% endif %} hide-on-med-only"> <div class="col {% if weekday.date == active_day %} s3 {% else %} s2 {% endif %} hide-on-med-only">
<div class="card timetable-title-card {% if weekday.date == active_day %} z-depth-5 {% endif %}"> <div class="card timetable-title-card {% if active_day and weekday.date == active_day %} z-depth-5 {% endif %}">
<div class="card-content"> <div class="card-content">
<span class="card-title"> <span class="card-title">
{{ weekday.name }} {{ weekday.name }}
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
{# Lessons #} {# Lessons #}
{% for row in timetable %} {% for row in timetable %}
<div class="row"> <div class="row">
<div class="col s1"> <div class="col {% if active_day %}s1{% else %}s2{% endif %}">
{% if row.type == "period" %} {% if row.type == "period" %}
{% include "chronos/partials/period_time.html" with period=row.period periods=periods %} {% include "chronos/partials/period_time.html" with period=row.period periods=periods %}
{% endif %} {% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment