From d2f758e6332a670c0d600063a0f6cb0e67994a8d Mon Sep 17 00:00:00 2001
From: Torgeir Lebesbye <torgeir@lebesbye.com>
Date: Wed, 10 Jan 2024 15:53:23 +0100
Subject: [PATCH] (re-)moved some inline styling (#146)

---
 .../templates/trix_course/add_course_admin.django.html |  3 +--
 .../templates/trix_course/course_admin.django.html     |  3 +--
 .../static/trix_student/dist/css/styles.css            |  9 +++++++++
 .../static/trix_student/src/less/assignments.less      | 10 +++++++++-
 .../static/trix_student/src/less/course.less           |  4 ++++
 .../trix_student/consent_form_base.django.html         |  2 +-
 .../trix_student/include/assignment.django.html        |  4 ++--
 7 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/trix/trix_course/templates/trix_course/add_course_admin.django.html b/trix/trix_course/templates/trix_course/add_course_admin.django.html
index 76afd673..258b6aad 100644
--- a/trix/trix_course/templates/trix_course/add_course_admin.django.html
+++ b/trix/trix_course/templates/trix_course/add_course_admin.django.html
@@ -33,8 +33,7 @@ <h1>Add course administrator to {{ course }}</h1>
             <td id="student{{ student.id }}">
                 {{ student.displayname }}
                 {% if student.is_superuser %}
-                    <i class="fa fa-check" style="color: green"
-                        title="{% trans 'Superuser' %}"></i>
+                    <i class="fa fa-check" title="{% trans 'Superuser' %}"></i>
                     <span class="sr-only">{% trans "Superuser" %}</span>
                 {% endif %}
             </td>
diff --git a/trix/trix_course/templates/trix_course/course_admin.django.html b/trix/trix_course/templates/trix_course/course_admin.django.html
index f4893c24..74ae715c 100644
--- a/trix/trix_course/templates/trix_course/course_admin.django.html
+++ b/trix/trix_course/templates/trix_course/course_admin.django.html
@@ -45,8 +45,7 @@ <h1>{{ course }}</h1>
                 <td>
                     {{ admin }}
                     {% if admin.is_superuser %}
-                        <i class="fa fa-check" style="color: green"
-                            title="{% trans 'Superuser' %}"></i>
+                        <i class="fa fa-check" title="{% trans 'Superuser' %}"></i>
                         <span class="sr-only">{% trans "Superuser" %}</span>
                     {% endif %}
                 </td>
diff --git a/trix/trix_student/static/trix_student/dist/css/styles.css b/trix/trix_student/static/trix_student/dist/css/styles.css
index 360f4e1f..f0111a2f 100644
--- a/trix/trix_student/static/trix_student/dist/css/styles.css
+++ b/trix/trix_student/static/trix_student/dist/css/styles.css
@@ -10392,6 +10392,9 @@ fieldset[disabled] .btn-trix-admin.active {
   margin-top: 0;
   padding-top: 0;
 }
+.trix-assignment > h2 > a {
+  color: black;
+}
 .trix-assignment .trix-assignmenttext {
   margin-top: 40px;
 }
@@ -10417,6 +10420,9 @@ fieldset[disabled] .btn-trix-admin.active {
 .trix-assignment-hidden {
   background: repeating-linear-gradient(-45deg, #ccc, #ccc 1px, transparent 1px, transparent 60px);
 }
+.trix-assignment-hidden > h2 > .fa-eye-slash {
+  font-size: 24px;
+}
 #assignments-taggingbox .assignments-progressbox {
   min-height: 80px;
 }
@@ -11323,6 +11329,9 @@ a {
 .trix-course-table-body > tr td:nth-child(2) {
   font-weight: bold;
 }
+.trix-course-table-body > tr td > .fa-check {
+  color: green;
+}
 .trix-course-remove-body {
   padding-left: 40px;
   padding-top: 30px;
diff --git a/trix/trix_student/static/trix_student/src/less/assignments.less b/trix/trix_student/static/trix_student/src/less/assignments.less
index 13278a70..32792e6b 100644
--- a/trix/trix_student/static/trix_student/src/less/assignments.less
+++ b/trix/trix_student/static/trix_student/src/less/assignments.less
@@ -40,11 +40,15 @@
         background-color: @state-success-bg;
     }
 
-    &>h2 {
+    > h2 {
         margin-top: 0;
         padding-top: 0;
     }
 
+    > h2 > a {
+        color: black;
+    }
+
     .trix-assignmenttext {
         margin-top: 40px;
     }
@@ -81,6 +85,10 @@
       transparent 1px,
       transparent 60px
     );
+
+    > h2 > .fa-eye-slash {
+        font-size: 24px;
+    }
 }
 
 #assignments-taggingbox {
diff --git a/trix/trix_student/static/trix_student/src/less/course.less b/trix/trix_student/static/trix_student/src/less/course.less
index 9bf58991..b19ae776 100644
--- a/trix/trix_student/static/trix_student/src/less/course.less
+++ b/trix/trix_student/static/trix_student/src/less/course.less
@@ -278,6 +278,10 @@
         &:nth-child(2) {
             font-weight: bold;
         }
+
+        > .fa-check {
+            color: green;
+        }
     }
 }
 
diff --git a/trix/trix_student/templates/trix_student/consent_form_base.django.html b/trix/trix_student/templates/trix_student/consent_form_base.django.html
index f9540dd5..71ff0c2a 100644
--- a/trix/trix_student/templates/trix_student/consent_form_base.django.html
+++ b/trix/trix_student/templates/trix_student/consent_form_base.django.html
@@ -5,7 +5,7 @@
 
 {% block content %}
     <div class="page-header">
-        <div class="container" style="text-align: center;">
+        <div class="container">
             {% block consent_title %}
             <h1>{% trans "Data collection consent form" %}</h1>
             {% endblock %}
diff --git a/trix/trix_student/templates/trix_student/include/assignment.django.html b/trix/trix_student/templates/trix_student/include/assignment.django.html
index ce05d211..166d7472 100644
--- a/trix/trix_student/templates/trix_student/include/assignment.django.html
+++ b/trix/trix_student/templates/trix_student/include/assignment.django.html
@@ -16,11 +16,11 @@
         </a>
     {% endif %}
     <h2 id="assignment-{{ assignment.id }}">
-        <a href="{% url 'trix_assignments_view' assignment.id %}" style="color:black;">
+        <a href="{% url 'trix_assignments_view' assignment.id %}">
             {{ assignment }}
         </a>
         {% if assignment.hidden %}
-            <span class="fa fa-eye-slash" style="font-size: 24px;" title="{% trans 'Hidden assignment' %}"></span>
+            <span class="fa fa-eye-slash" title="{% trans 'Hidden assignment' %}"></span>
         {% endif %}
     </h2>