From 08add62ee412d62708c1f6a2f2dff3d656da49f4 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 14 Apr 2017 10:52:25 -0400
Subject: [PATCH] fixing price slash red color merge conflict

fixing merge conflict where Laury originally had a red slash through the sale price in list
view theme file. re adding the js for that section
---
 glm-member-db/views/front/members/list.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 7019133..b176229 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -389,6 +389,7 @@
         $('.glm-member-list-record').each(function(){
            if( $(this).find('.slash-price').length != 0 ){
                $(this).find('.msrp-value').addClass('sale');
+               $(this).find('.msrp-value').css('color','black').css('text-decoration','none').removeClass('glm-columns').wrap('<div class="mrsp-sale-wrapper" style="text-decoration: line-through; color: red;"></div>');
 //               $(this).find( $('.sale-price-value') ).insertAfter( $(this).find('.sale') ).css('display', 'block').css('float', 'right').addClass('sale-text');
            }
         });
-- 
2.17.1