From 601193ff3c551fdfdf073d33b6721ed32cd92603 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Jul 2019 22:42:13 -0500 Subject: [PATCH] small change comment --- core/static/core/style.scss | 32 ++++++++++++--------- pedagogy/templates/pedagogy/uv_detail.jinja | 16 +++++------ 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/core/static/core/style.scss b/core/static/core/style.scss index f5270c72..cae1d2c4 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -1683,16 +1683,15 @@ label { #pedagogy { font-family: "Fira Sans"; color: #062f38; - background-color: #caf0ff; - .comment{ - background-color: #caf0ff; + .comment { max-width: 100%; max-height: 200px; overflow: hidden; - margin-bottom: 40px; + margin-bottom: 30px; + margin-top: 10px; - .grade{ - height: 200px; + .grade { + height: 156px; float: left; text-align: left; padding: 15px; @@ -1702,28 +1701,30 @@ label { background-color: #1bb9ea; } - .dif_grade{ + .dif_grade { background-color: #1bb9ea; color: #f0f0f0; - height: 200px; + height: 156px; float: left; + font-weight: bold; text-align: right; padding: 15px; padding-top: 0px; } - .author_info{ + .author_info { background-color: #1bb9ea; color: #f0f0f0; text-align: center; width: 50px; padding: 5px; + font-weight: bold; margin: 0px; float: left; padding-right: 50px; clip-path: polygon(0 0, 0 100%, 100% 100%, 75% 0); } - .date_info{ + .date_info { background-color: #1bb9ea; color: #f0f0f0; float: left; @@ -1733,16 +1734,21 @@ label { margin: 0px; } - .text{ + .action { + float: left; + text-align: center; + padding: 5px; + margin: 0px; + } + + .text { height: 125px; margin-top: 0px; margin-right: 0px; padding: 10px; padding-left: 40px; - margin-bottom: 29px; overflow: auto; text-align: justify; - background-color: #caf0ff; } } } \ No newline at end of file diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja index 4861a050..c75e5eaa 100644 --- a/pedagogy/templates/pedagogy/uv_detail.jinja +++ b/pedagogy/templates/pedagogy/uv_detail.jinja @@ -9,9 +9,7 @@

{% trans %}Back{% endtrans %}

{{ object.code }} - {{ object.title }}

-

{{ object.department }}

-

{{ object.credit_type }}

-

{{ object.semester }}

+

{{ object.department }} {{ object.credit_type }} {{ object.semester }}

{{ object.objectives|markdown }}

{{ object.program|markdown }}

{{ object.skills|markdown }}

@@ -47,15 +45,17 @@

{{ comment.author }}

{# Warning, it's not displayed yet #} -

{% trans %}Report{% endtrans %}

+

+ {% trans %}Report{% endtrans %} + {% if user.is_owner(comment) %} + {% trans %}Edit{% endtrans %} + {% trans %}Delete{% endtrans %} + {% endif %} +

{% if comment.is_reported %}

{% trans %}This comment has been reported{% endtrans %}

{% endif %} - {% if user.is_owner(comment) %} -

{% trans %}Edit{% endtrans %}

-

{% trans %}Delete{% endtrans %}

- {% endif %}
{% endfor %} {% endif %}