Skip to content

Commit

Permalink
(re-)moved some inline styling (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
torgeirl committed Jan 10, 2024
1 parent ae0d939 commit d2f758e
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions trix/trix_student/static/trix_student/dist/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 9 additions & 1 deletion trix/trix_student/static/trix_student/src/less/assignments.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -81,6 +85,10 @@
transparent 1px,
transparent 60px
);

> h2 > .fa-eye-slash {
font-size: 24px;
}
}

#assignments-taggingbox {
Expand Down
4 changes: 4 additions & 0 deletions trix/trix_student/static/trix_student/src/less/course.less
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@
&:nth-child(2) {
font-weight: bold;
}

> .fa-check {
color: green;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit d2f758e

Please sign in to comment.