From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Wed, 25 Nov 2015 10:23:07 +0000 (+0000)
Subject: Make merge CSS less specific and better integrated
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66d5b9896f4d6e34029fad5737ae215bdab7a88e;p=civicrm-core.git

Make merge CSS less specific and better integrated
---

diff --git a/css/civicrm.css b/css/civicrm.css
index 100951216f..3d4bf9dc77 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3163,6 +3163,14 @@ div.m ul#civicrm-menu,
 }
 
 /* table row highlightng */
+.crm-container .crm-row-ok {
+  background-color: #EFFFE7;
+  border-bottom: 1px solid #ccc;
+}
+.crm-container .crm-row-error {
+  background-color: #FFECEC;
+  border-bottom: 1px solid #ccc;
+}
 .crm-container table.row-highlight tr:hover,
 .crm-container .crm-row-selected {
   background-color: #FFFFCC;
@@ -3173,18 +3181,6 @@ div.m ul#civicrm-menu,
 .crm-container .even.crm-row-selected {
   background-color: #fffdb2;
 }
-.crm-container table tr.merge-row-equal {
-  background-color: #EFFFE7;
-  border-bottom: 1px solid #ccc;
-}
-.crm-container table tr.merge-row-diff {
-  background-color: #FFECEC;
-  border-bottom: 1px solid #ccc;
-}
-.crm-container table tr.merge-row-equal.crm-row-selected,
-.crm-container table tr.merge-row-diff.crm-row-selected {
-  background-color: #fffdb2;
-}
 
 #crm-container .crm-socialnetwork {
   margin-top: 1em;
diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index dd1041ef32..015c20a3ff 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -85,9 +85,9 @@
         </td>
     {else}
       {if $row.main eq $row.other}
-         <tr class="merge-row-equal {cycle values="odd-row,even-row"}">
+         <tr class="merge-row-equal crm-row-ok {cycle values="odd-row,even-row"}">
       {else}
-         <tr class="merge-row-diff {cycle values="odd-row,even-row"}">
+         <tr class="crm-row-error {cycle values="odd-row,even-row"}">
       {/if}
         <td>
           {$row.title}