diff --git a/kitsune/sumo/jinja2/sumo/includes/question_entry.html b/kitsune/sumo/jinja2/sumo/includes/question_entry.html index 4301d5c574e..90821cef612 100644 --- a/kitsune/sumo/jinja2/sumo/includes/question_entry.html +++ b/kitsune/sumo/jinja2/sumo/includes/question_entry.html @@ -194,24 +194,26 @@

{% if question.channel != "direct_support" and question.last_answer %} - - {{ display_name(question.last_answer.creator)|truncate(20) }} - {{ _('replied') }} - {{ question.last_answer.created|timesince }} + {% trans name=display_name(question.last_answer.creator)|truncate(20), + b_open=''|safe, + when=question.last_answer.created|timesince, + a_open=''|safe, a_close=''|safe %} + {{ b_open }}{{ name }}{{ b_close }} replied {{ a_open }}{{ when }}{{ a_close }} + {% endtrans %} {% endif %}
diff --git a/kitsune/sumo/jinja2/sumo/includes/thread_post.html b/kitsune/sumo/jinja2/sumo/includes/thread_post.html index bddf7e78c44..c217bba7235 100644 --- a/kitsune/sumo/jinja2/sumo/includes/thread_post.html +++ b/kitsune/sumo/jinja2/sumo/includes/thread_post.html @@ -67,10 +67,10 @@
{% if obj.product %} + {% set _product_title = pgettext('DB: products.Product.title', obj.product.title) %} {% if obj.channel == "direct_support" %} - + {% else %} - {% set _product_title = pgettext('DB: products.Product.title', obj.product.title) %}
- - + {% trans name=display_name(obj.last_answer.creator)|truncate(20), + b_open=''|safe, + when=obj.last_answer.created|timesince, + a_open=''|safe, a_close=''|safe %} + {{ b_open }}{{ name }}{{ b_close }} replied {{ a_open }}{{ when }}{{ a_close }} + {% endtrans %} {% elif obj.channel == "direct_support" and obj.zd_updated_at and obj.zd_updated_at != obj.created %} {% endif %}
diff --git a/kitsune/sumo/static/sumo/scss/layout/_question-entry.scss b/kitsune/sumo/static/sumo/scss/layout/_question-entry.scss index 122fec27512..1554e5d7a4e 100644 --- a/kitsune/sumo/static/sumo/scss/layout/_question-entry.scss +++ b/kitsune/sumo/static/sumo/scss/layout/_question-entry.scss @@ -102,8 +102,8 @@ display: inline-flex; align-items: center; gap: p.$spacing-xs; - color: inherit; text-decoration: none; + white-space: nowrap; svg { width: p.$spacing-md; @@ -119,6 +119,7 @@ a.question-entry--meta-item, .question-entry--meta-item a { + color: inherit; text-decoration: none; &:hover { @@ -151,41 +152,11 @@ } } -.question-entry--meta-asked-by { +.question-entry--meta-bold { color: var(--color-heading); font-weight: 600; } -.question-entry--last-reply { - display: inline-flex; - align-items: center; - gap: p.$spacing-xs; - white-space: nowrap; - - svg { - width: p.$spacing-md; - height: p.$spacing-md; - flex-shrink: 0; - } -} - -.question-entry--last-reply-name { - color: var(--color-heading); - font-weight: 600; -} - -.question-entry--last-reply-time { - position: relative; - z-index: 1; - color: var(--color-text-light); - text-decoration: none; - - &:hover { - text-decoration: underline; - color: var(--color-link); - } -} - .question-entry--extras { position: relative; z-index: 1;