From 1459686965ca91ce7ac5af1b4d1ab3da829685c5 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Fri, 30 Nov 2012 13:17:55 +0000 Subject: Adjusted CSS not to colour non-raised alerts in tables. --- static/stylesheets/mauve.css | 7 +++---- views/_alerts_table_alert_summary.haml | 2 +- views/_search_table_row.haml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/stylesheets/mauve.css b/static/stylesheets/mauve.css index cac6833..64a95db 100644 --- a/static/stylesheets/mauve.css +++ b/static/stylesheets/mauve.css @@ -23,16 +23,15 @@ tr { border-bottom: none; } -tr.urgent { +tr.urgent.raised { background-color: #f88; } -tr.normal { - /* Mauve, as defined by wikipedia. */ +tr.normal.raised { background-color: #ff8; } -tr.low { +tr.low.raised { background-color: #8f8; } diff --git a/views/_alerts_table_alert_summary.haml b/views/_alerts_table_alert_summary.haml index 4159cf7..58e3eea 100644 --- a/views/_alerts_table_alert_summary.haml +++ b/views/_alerts_table_alert_summary.haml @@ -1,5 +1,5 @@ - alert = alerts_table_alert_summary if defined? alerts_table_alert_summary -- row_class = (row_class || []) + [ cycle(nil, "hilight"), alert.raised? && "triggered", alert.acknowledged? && "acknowledged", alert.level] +- row_class = (row_class || []) + [ cycle(nil, "hilight"), alert.raised? && "raised", alert.acknowledged? && "acknowledged", alert.level] %tr{ :class => row_class, :id => ["tr", "summary", alert.id] } %td %input{ :type => "checkbox", :id => "alerts[#{alert.id}]", :name => "alerts[#{alert.id}]", :class => 'alert' } diff --git a/views/_search_table_row.haml b/views/_search_table_row.haml index 3226bc7..e971c42 100644 --- a/views/_search_table_row.haml +++ b/views/_search_table_row.haml @@ -1,5 +1,5 @@ - alert = search_table_row if defined? search_table_row -- row_class = (row_class || []) + [ cycle(nil, "hilight"), alert.raised? && "triggered", alert.acknowledged? && "acknowledged", alert.level] +- row_class = (row_class || []) + [ cycle(nil, "hilight"), alert.raised? && "raised", alert.acknowledged? && "acknowledged", alert.level] %tr{ :class => row_class, :id => ["tr", "summary", alert.id] } %td %input{ :type => "checkbox", :id => "alerts[#{alert.id}]", :name => "alerts[#{alert.id}]", :class => 'alert' } -- cgit v1.2.1