From 84fdf750c544817e9103a30d8e90231a6bb7251c Mon Sep 17 00:00:00 2001
From: Mark Moser <mark.moser@perficient.com>
Date: Sun, 21 Aug 2016 14:11:07 -0500
Subject: [PATCH] premerge cleanup

---
 .gitignore                                       |   1 -
 app/assets/images/yellowborder.jpg               | Bin 1501 -> 0 bytes
 .../mailers/foundation_global_overrides.scss     |   4 ++--
 .../mailers/foundation_vendor_manifest.scss      |   6 ++----
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 app/assets/images/yellowborder.jpg

diff --git a/.gitignore b/.gitignore
index 9631b7d..da83347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@ tmux*log
 /vendor/bundle
 /lib/bundler/man/
 /vendor/assets/*
-!/vendor/assets/foundation-emails
 bower_components/
 node_modules/
 .DS_Store
diff --git a/app/assets/images/yellowborder.jpg b/app/assets/images/yellowborder.jpg
deleted file mode 100644
index 84e2269af76592db9aba159b8e21db77687c6395..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1501
zcmb_cO>fgc5MA3Xv<RdIgj9(G#+4AD#-B+VTMbcTry>WVDpUfFuDxxn)Lvsd#O;~?
z!;J$RK!_g!^wc|opJ2wW6Sp))m0;wR-j3(Zn_15~{hA)5<!<8cBGl_WLJO$0^arXK
zBYSv&C^QFd2ch(sQ3i1wXoBEJyycJ`%-h5h5-SiSUKG%JI|(d%h+}pK@40@9`}N@?
z$GT37dtNt1GtlwCeR3G$XNOO>?Zct1I$ZlPyPjx?7kD_f*u>lSBQ0rhd2$VK<`y_M
z4~d5@ZX;7=Uzl60PD0Gq`9{^26q#L9d8w|-&Dts}i&8@nYl5U!B}Id$CbETbpcXp2
zTHn|#v|!ibil)ZnF+Wy#67B(4RRvKNWVs3v)#$*Ft)%KlE0YWcj_lA4Vwd=AmeJZF
zqqxOEr6(<T!8Gm6vpN-Mntu=VyzBt-v{Bs0WxX>KN81Mh7Wz0MqtM0>zLJpxO%JgZ
zlW?1m{mChA4M<F)0SQ=L&rYq**VzZAWxIanewg!2Q|tLrZ230s87&Sn@viG=O{F7t
zn&L*i)9FZ3x1lPEu6GSdlGkcAX{|Bg8pIxX*pDY%2e^$+L+Lb)Ze5p^ncQq7ya1F9
z9J;Tuvl$YP&0E*pi)(3KT+0d9nNds8hk7AbfMSH~1E2cf6BkTT2B+f-o9P9>K1_WG
z<DLFQ_w%7e&L_A=6oYQhF;}kLKxqCBtaVuLVI8GM=nbMSZ**zQ)CxLHQScVl^u=XC
z`WaOg&@#QsP!&X1D5gTCU(hQkto$?NXfcyI>$|$R^oIupm2;k(=RCL0dD8FbIzxdz
zQ-KqEo22OFS*d^B-35gOsGpjr`#Gdb$dr(#ue6H*ri2tV^->JgzE@-@Av1wx6H7<l
UyZ`x|)DJpKrFsD~b%5V~1LrGs+W-In

diff --git a/app/assets/stylesheets/mailers/foundation_global_overrides.scss b/app/assets/stylesheets/mailers/foundation_global_overrides.scss
index 5bc7bc8..de181b3 100644
--- a/app/assets/stylesheets/mailers/foundation_global_overrides.scss
+++ b/app/assets/stylesheets/mailers/foundation_global_overrides.scss
@@ -1,6 +1,6 @@
-// manny, put stuff here to override foundation settings
+// foundation overrides
 
 $success-color: #EF0734;
 $global-width: 600px;
 $body-font-family: inherit;
-$body-background: #ffffff;
\ No newline at end of file
+$body-background: #ffffff;
diff --git a/app/assets/stylesheets/mailers/foundation_vendor_manifest.scss b/app/assets/stylesheets/mailers/foundation_vendor_manifest.scss
index 70c2b1a..3667674 100644
--- a/app/assets/stylesheets/mailers/foundation_vendor_manifest.scss
+++ b/app/assets/stylesheets/mailers/foundation_vendor_manifest.scss
@@ -1,10 +1,8 @@
-// Foundation for Emails by ZURB
-// foundation.zurb.com
-// Licensed under MIT Open Source
-//
 @import 'foundation-emails/scss/util/util',
         'foundation-emails/scss/global',
+
         'foundation_global_overrides',
+
         'foundation-emails/scss/components/normalize',
         'foundation-emails/scss/grid/grid',
         'foundation-emails/scss/grid/block-grid',