Merge branch 'master' of https://github.com/civicrm/mosaico

src/css/app_standalone_material.less

@@ -1,10 +1,10 @@
 @import 'app_standalone.less';
 
-@accent-color: #900000; // #A01020; // #ff9800;
+@accent-color: #4d5663; // #A01020; // #ff9800;
 @background-color: #eeeeee;
 // @link-color: #ff9800;
 // @link-color: #ff5722; // #ea1c0d;
-@link-color: #ff5722; // #ea1c0d;
+@link-color: #42afcb; // #ea1c0d;
 
 @font-family: "Noto Sans", "Helvetica Neue", Helvetica, Arial, "Nimbus Sans L", "Liberation Sans", Arimo, sans-serif;
 @standard-border-radius: 2px;

src/js/app.js

@@ -52,7 +52,7 @@ var applyBindingOptions = function(options, ko) {
   };
 
   ko.bindingHandlers.wysiwygSrc.placeholderUrl = function(width, height, text, method) {
-    var imgProcessorBackend = options.imgProcessorBackend ? options.imgProcessorBackend : './upload';
+    var imgProcessorBackend = options.imgPlaceholderUrl ? options.imgPlaceholderUrl : './upload';
     return _appendUrlParameters(imgProcessorBackend, { method: method ? method : 'placeholder', params: width + "," + height, text: text });
   };
 

src/js/bindings/wysiwygs.js

@@ -344,7 +344,7 @@ ko.bindingHandlers.wysiwyg = {
       // we have to disable preview_styles otherwise tinymce push inline every style he thinks will be applied and
       // this makes the style menu to inherit color/font-family and more.
       preview_styles: false,
-      paste_as_text: true,
+      paste_as_text: false,
       language: 'en',
       schema: "html5",
 

src/js/viewmodel.js

@@ -49,7 +49,7 @@ function initializeEditor(content, blocks, thumbPathConverter, galleryUrl, conte
     debug: ko.observable(false),
     contentListeners: ko.observable(0),
 
-    logoPath: 'rs/img/mosaico32.png',
+    logoPath: '//mosaico.io/dist/img/mosaico32.png',
     logoUrl: '.',
     logoAlt: 'mosaico'
   };

templates/versafix-1/template-versafix-1.html

@@ -1647,28 +1647,4 @@
 
   </div>
 
-
-    <!-- footerBlock -->
-    <table role="presentation" class="vb-outer" width="100%" cellpadding="0" border="0" cellspacing="0" bgcolor="#3f3f3f" style="background-color: #3f3f3f; -ko-background-color: @[backgroundColor]; -ko-attr-bgcolor: @[backgroundColor]" data-ko-block="footerBlock">
-      <tr><td class="vb-outer" align="center" valign="top" style="padding-left: 9px; padding-right: 9px; font-size: 0">
-    <!--[if (gte mso 9)|(lte ie 8)]><table role="presentation" align="center" border="0" cellspacing="0" cellpadding="0" width="570"><tr><td align="center" valign="top"><![endif]--><!--
-      --><div style="margin: 0 auto; max-width: 570px; -mru-width: 0px"><table role="presentation" class="vb-row" border="0" cellpadding="0" cellspacing="0" style="border-collapse: collapse; width: 100%; max-width: 570px; -mru-width: 0px" width="570">
-
-      <tr>
-      <td align="center" valign="top" style="font-size: 0; padding: 0 9px; padding-top: 4px; padding-bottom: 4px; -ko-padding-top: @[blockSpacing.topPadding]px; -ko-padding-bottom: @[blockSpacing.bottomPadding]px;"><div style="vertical-align:top; width:100%; max-width: 552px; -mru-width: 0px"><!--
-        --><table role="presentation" border="0" cellspacing="9" cellpadding="0" style="border-collapse: collapse; width: 100%" width="552">
-
-        <tr><td class="long-text links-color" width="100%" valign="top" style="font-weight: normal; color: #919191; font-size: 13px; font-family: Arial, Helvetica, sans-serif; padding: 9px; padding-top: 5px; padding-bottom: 5px; padding: 9px; padding-top: 5px; padding-bottom: 5px; -ko-padding: @[blockSpacing.horizontalSpacing]px; -ko-padding-top: @[blockSpacing.verticalSpacing]px; -ko-padding-bottom: @[blockSpacing.verticalSpacing]px; text-align: center; -ko-font-size: @[longTextStyle.size]px; -ko-color: @longTextStyle.color; -ko-font-family: @longTextStyle.face" align="center" data-ko-editable="longText"><p>Email sent to <a href="mailto:[mail]">[mail]</a></p></td></tr>
-        <tr><td width="100%" valign="top" style="font-weight: normal; color: #ffffff; font-size: 13px; font-family: Arial, Helvetica, sans-serif; text-align: center; -ko-font-size: @[linkStyle.size]px; -ko-color: @linkStyle.color; -ko-font-family: @linkStyle.face; padding: 9px; padding-top: 5px; padding-bottom: 5px; padding: 9px; padding-top: 5px; padding-bottom: 5px; -ko-padding: @[blockSpacing.horizontalSpacing]px; -ko-padding-top: @[blockSpacing.verticalSpacing]px; -ko-padding-bottom: @[blockSpacing.verticalSpacing]px;" align="center"><a style="color: #ffffff; -ko-color: @[Color.readability(linkStyle.color, backgroundColor) gt 2 ? linkStyle.color : (Color.isReadable('#ffffff', backgroundColor) ? '#ffffff' : '#000000')]; text-decoration: underline; -ko-color: @linkStyle.color; -ko-text-decoration: @linkStyle.decoration" href="[unsubscribe_link]" data-ko-editable="disiscrivitiText">Unsubscribe</a></td></tr>
-        <tr data-ko-display="_root_.sponsor.visible" style="display: none; text-align: center"><td width="100%" valign="top" align="center" class="links-color" style="padding: 9px; padding-top: 5px; padding-bottom: 5px; padding: 9px; padding-top: 5px; padding-bottom: 5px; -ko-padding: @[blockSpacing.horizontalSpacing]px; -ko-padding-top: @[blockSpacing.verticalSpacing]px; -ko-padding-bottom: @[blockSpacing.verticalSpacing]px; text-align: center"><!--[if (lte ie 8)]><div style="display: inline-block; width: 170px; -mru-width: 0px"><![endif]--><a href="" style="display: inline-block; -ko-attr-href: @_root_.sponsor.url"><img alt="sponsor" border="0" hspace="0" align="center" vspace="0" style="vertical-align:top; height: auto; margin: 0 auto; color: #3f3f3f; font-size: 13px; font-family: Arial, Helvetica, sans-serif; -ko-attr-src: @_root_.sponsor.src; -ko-attr-alt: @_root_.sponsor.alt; -ko-attr-alt-if: _root_.sponsor.alt !== ''; width: 100%; max-width: 170px" width="170" src="img/sponsor.gif"></a><!--[if (lte ie 8)]></div><![endif]--></td></tr>
-
-        </table></div></td>
-    </tr>
-
-      </table></div><!--
-    --><!--[if (gte mso 9)|(lte ie 8)]></td></tr></table><![endif]-->
-  </td></tr>
-    </table>
-    <!-- /footerBlock -->
-
 </center><!--[if !(gte mso 15)]--></body><!--<![endif]--></html>