From: Arthur <arthur@zurb.com>
Date: Mon, 2 Dec 2013 22:21:50 +0000 (-0800)
Subject: fixing conflict on merge
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fnotable;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fixing conflict on merge
---

87993264930cfbf31c9e8c9e29afa1bac67e3069
diff --cc .gitignore
index 1aa3d45a,1aa3d45a..bfd77de8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
  .sass-cache/*
++.DS_Store
diff --cc stylesheets/app.css
index 11e27151,29cfb3f0..1bce0112
--- a/stylesheets/app.css
+++ b/stylesheets/app.css
@@@ -12791,9 -12745,9 +12793,9 @@@ ul.mobile-nav a.current 
    margin: 5px 10px;
    float: right;
  }
 -/* line 586, ../sass/app.scss */
 +/* line 603, ../sass/app.scss */
  #previewModal iframe {
-   margin-top: 40px;
+   margin-top: 47px;
    border: none;
    width: 100%;
    height: 100%;