Merge branch 'master' into fadeit@v4.x

This commit is contained in:
Sander Sink 2017-07-12 19:08:49 +03:00
commit d5df4ced66
3 changed files with 25 additions and 18 deletions

View File

@ -13,8 +13,13 @@ Here are some examples:
![responsive emails-02](https://cloud.githubusercontent.com/assets/1515742/10591901/139c4954-76b9-11e5-80f7-5b0ccaf5af81.png)
## Getting started
- Clone repo `git clone https://github.com/fadeit/responsive-html-email-signature.git`
- Clone repo & run `yarn` or `npm install`
- Edit files in */templates* and run `gulp` to build them into *./dist*
- Run `gulp` to generate templates from configuration
### Customizing templates
- Edit files in */templates*
- Run `gulp watch` to watch templates and re-generate
- Open files from `./dist` in your fav browser to check them out
> When you're done, check out [how to add them to your email client of choice](#usage-with-different-email-clients) if in doubt.
@ -47,6 +52,8 @@ $ yarn # or npm install
$ gulp # By default, HTML & CSS files in './src' will be watched for changes
```
> Note: it's built using node v7.x, so please make sure your node version is up to date. Version 6+ should be fine.
### Configuring
To make a basic email from existing templates, you only have to edit the `conf.json` file in each template.
@ -222,7 +229,7 @@ Unfortnately, Outlook 2010 client dosen't support HTML file import features for
> **NB**: base 64 will not be shown on Outlook 2010 client. So, I recommend to use external url if you want to use images.
===================
------------------------------
<br/>
<a href="http:fadeit.dk"><img src="https://fadeit.dk/src/assets/img/brand/fadeit_logo_full.svg" alt="The fadeit logo" style="width:200px;"/></a><br/><br/>

View File

@ -27,4 +27,4 @@ fs
});
/** By default templates will be built into '/dist', then gulp will watch for changes in '/src'. */
gulp.task('default', ['dupe', 'less', 'sass', 'postcss', 'lint', 'build', 'watch']);
gulp.task('default', ['dupe', 'less', 'sass', 'postcss', 'lint', 'build']);

View File

@ -1,6 +1,6 @@
{
"name": "responsive-html-email-signature",
"version": "4.0.1",
"version": "4.0.2",
"description": "Responsive template for email signatures",
"main": "index.js",
"repository": {