premerge cleanup

2016-08-21 14:11:07 -05:00 · 2016-08-21 14:11:07 -05:00 · 84fdf750c5
commit 84fdf750c5
parent c6f5577670
4 changed files with 4 additions and 7 deletions
--- 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
--- a/app/assets/images/yellowborder.jpg
+++ b/app/assets/images/yellowborder.jpg
--- 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;
+$body-background: #ffffff;
--- 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',