From 0395d5b03826e382f2c39eadb79710dfb995c693 Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Mon, 25 Jun 2018 12:01:31 +0200 Subject: [PATCH] Fix/highlight rfcs (#182) * Fix highlighting condition * Use highlighting color that is easier on the eyes --- app/assets/stylesheets/request-for-comments.css.scss | 2 +- app/views/request_for_comments/index.html.slim | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss index c08b92a9..77b0810b 100644 --- a/app/assets/stylesheets/request-for-comments.css.scss +++ b/app/assets/stylesheets/request-for-comments.css.scss @@ -262,5 +262,5 @@ input#subscribe { } .do-not-answer { - background-color: #990000; + background-color: #ea2f1085; } diff --git a/app/views/request_for_comments/index.html.slim b/app/views/request_for_comments/index.html.slim index be04110d..d253f0ab 100644 --- a/app/views/request_for_comments/index.html.slim +++ b/app/views/request_for_comments/index.html.slim @@ -23,7 +23,8 @@ h1 = RequestForComment.model_name.human(count: 2) th = t('activerecord.attributes.request_for_comments.last_update') tbody - @request_for_comments.each do |request_for_comment| - tr data-id=request_for_comment.id class=('do-not-answer' if ([:rfc_intervention_stale_rfc, :break_intervention_stale_rfc, :no_intervention_stale_rfc].include?(UserGroupSeparator.getInterventionGroup(current_user)) and current_user.internal_user?)) + - do_not_answer = [:rfc_intervention_stale_rfc, :break_intervention_stale_rfc, :no_intervention_stale_rfc].include?(UserGroupSeparator.getInterventionGroup(request_for_comment.user)) and current_user.internal_user? + tr data-id=request_for_comment.id class=('do-not-answer' if do_not_answer) - if request_for_comment.solved? td span class="fa fa-check" aria-hidden="true" @@ -42,4 +43,4 @@ h1 = RequestForComment.model_name.human(count: 2) td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.created_at)) td = t('shared.time.before', time: distance_of_time_in_words_to_now(request_for_comment.last_comment.nil? ? request_for_comment.updated_at : request_for_comment.last_comment)) -= render('shared/pagination', collection: @request_for_comments) \ No newline at end of file += render('shared/pagination', collection: @request_for_comments)