From: Arthur <arthur@zurb.com>
Date: Tue, 22 Oct 2013 17:26:00 +0000 (-0700)
Subject: Updating file merge
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc2c110703f0228bff6f5932f08e3972d4ffc769;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

Updating file merge
---

fc2c110703f0228bff6f5932f08e3972d4ffc769
diff --cc images/templates/basic.jpg
index 00000000,00000000..989136cf
new file mode 100644
Binary files differ
diff --cc images/templates/hero-th.jpg
index 00000000,00000000..6473ff3e
new file mode 100644
Binary files differ
diff --cc images/templates/hero.jpg
index 00000000,00000000..6473ff3e
new file mode 100644
Binary files differ
diff --cc images/templates/newsletter.jpg
index 00000000,00000000..203e0efe
new file mode 100644
Binary files differ
diff --cc images/templates/sidebar-hero.jpg
index 00000000,00000000..a375f4f4
new file mode 100644
Binary files differ
diff --cc images/templates/sidebar.jpg
index 00000000,00000000..d167c9aa
new file mode 100644
Binary files differ
diff --cc stylesheets/app.css
index 6c91e2a8,e1b07b3a..2c33e2b9
--- a/stylesheets/app.css
+++ b/stylesheets/app.css
@@@ -10788,3 -10732,64 +10732,64 @@@ ul.mobile-nav a.current 
      padding-bottom: 140px;
    }
  }
+ 
+ /* inliner */
+ /* line 487, ../sass/app.scss */
+ .inliner-form .inactive {
+   display: none;
+ }
+ /* line 488, ../sass/app.scss */
+ .inliner-form textarea {
+   min-height: 600px;
+ }
+ /* line 489, ../sass/app.scss */
+ .inliner-form label {
+   margin-bottom: 8px;
+   line-height: 1.4;
+ }
+ /* line 490, ../sass/app.scss */
+ .inliner-form.options label {
+   margin-bottom: 0;
+ }
+ 
+ /* line 492, ../sass/app.scss */
+ .inky-inliner {
+   margin-bottom: 50px;
+ }
+ /* line 493, ../sass/app.scss */
+ .inky-inliner h4 {
+   margin-bottom: 5px;
+ }
+ /* line 494, ../sass/app.scss */
+ .inky-inliner p {
+   margin-bottom: 10px;
+ }
+ /* line 495, ../sass/app.scss */
+ .inky-inliner .button {
+   background: #004454;
+   color: #FFF;
+ }
+ /* line 496, ../sass/app.scss */
+ .inky-inliner .button:hover {
+   background: #002B36;
+ }
+ 
+ /* line 499, ../sass/app.scss */
+ .inline-advantages {
+   margin-left: 25px;
+ }
+ 
+ /* compatibility */
+ /* line 503, ../sass/app.scss */
+ table span {
+   display: block;
+   text-align: center;
+ }
+ /* line 504, ../sass/app.scss */
+ table .check {
+   color: green;
+ }
+ /* line 505, ../sass/app.scss */
+ table .x {
+   color: red;
 -}
++}