Updating file merge

diff --cc images/templates/basic.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..989136cf0460c235fcbf9e231ace897c3665a795
new file mode 100644 (file)
Binary files differ

diff --cc images/templates/hero-th.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6473ff3eb4320a3747dc011f118b14e15678f84e
new file mode 100644 (file)
Binary files differ

diff --cc images/templates/hero.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6473ff3eb4320a3747dc011f118b14e15678f84e
new file mode 100644 (file)
Binary files differ

diff --cc images/templates/newsletter.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..203e0efe5f5c153a054bd37cb3282c7e1ad41dc2
new file mode 100644 (file)
Binary files differ

diff --cc images/templates/sidebar-hero.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a375f4f47ba87ad4d98e77eb4b69f500aa3e5d25
new file mode 100644 (file)
Binary files differ

diff --cc images/templates/sidebar.jpg
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d167c9aa92cf29086a78902636680af6ccafda55
new file mode 100644 (file)
Binary files differ

diff --cc sass/app.scss
Simple merge

diff --cc stylesheets/app.css
index 6c91e2a8a26ba41ec6cac4118387516598fd3ac4,e1b07b3acda815709c2aff4b6a44c01ccc7c9e7e..2c33e2b95a7e7e1809d85224145ddd7e969765a4
--- 1/stylesheets/app.css
--- 2/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;
++}