diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 796d0c8b6df2f7dc016c3eab572dd2d4bfa22c22..d8ea9a3d8e03fa11da9e4e58fe04754b90e8b193 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_. Unreleased ---------- +Changed +~~~~~~~ + +* Ignore lesson background colour if it is the same as the foreground colour + `2.1`_ - 2022-01-04 ------------------- diff --git a/aleksis/apps/chronos/templates/chronos/partials/subject_colour.html b/aleksis/apps/chronos/templates/chronos/partials/subject_colour.html index f5404d35baa007c80d5e88cd41190c67ce4830d5..4cead55119b2c4b799c13018dc175c2fe414f059 100644 --- a/aleksis/apps/chronos/templates/chronos/partials/subject_colour.html +++ b/aleksis/apps/chronos/templates/chronos/partials/subject_colour.html @@ -1,6 +1,6 @@ {% if subject.colour_fg %} color: {{ subject.colour_fg }}; {% endif %} -{% if subject.colour_bg %} +{% if subject.colour_bg and subject.colour_bg != subject.colour_fg %} background-color: {{ subject.colour_bg }}; {% endif %} diff --git a/aleksis/apps/chronos/templates/chronos/partials/supervision.html b/aleksis/apps/chronos/templates/chronos/partials/supervision.html index c0364cfdb7130073436fde78587652b5dd760a78..0fff8f5cfef6c5fa1e897c0705210ce3d1a3ca54 100644 --- a/aleksis/apps/chronos/templates/chronos/partials/supervision.html +++ b/aleksis/apps/chronos/templates/chronos/partials/supervision.html @@ -7,7 +7,7 @@ {% if supervision.area.colour_fg %} color: {{ supervision.area.colour_fg }}; {% endif %} - {% if supervision.area.colour_bg %} + {% if supervision.area.colour_bg and supervision.area.colour_bg != supervision.area.colour_fg %} background-color: {{ supervision.area.colour_bg }}; {% endif %} " class="{% if supervision.get_substitution and smart %}lesson-with-sub{% endif %}">