Skip to content

Commit

Permalink
Merge pull request #9 from fluentdesk/rfact/fluent-themes
Browse files Browse the repository at this point in the history
Rename watermark to fluent-themes.
  • Loading branch information
hacksalot committed Oct 26, 2015
2 parents 6f578f9 + 6d6f66b commit 783525c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@
},
"homepage": "https://github.com/fluentdesk/fluentcmd",
"dependencies": {
"mkdirp": "^0.5.1",
"underscore": "^1.8.3",
"fluent-themes": "0.1.0-beta",
"fs-extra": "^0.24.0",
"html": "0.0.10",
"is-my-json-valid": "^2.12.2",
"jst": "0.0.13",
"marked": "^0.3.5",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"moment": "^2.10.6",
"underscore": "^1.8.3",
"watermark": "fluentdesk/watermark#v0.3.1-alpha",
"wkhtmltopdf": "^0.1.5",
"xml-escape": "^1.0.0",
"yamljs": "^0.2.4"
Expand Down
2 changes: 1 addition & 1 deletion src/fluentcmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports = function () {

// Load the active theme
// Verify the specified theme name/path
var tFolder = PATH.resolve( __dirname, '../node_modules/watermark/themes', _opts.theme );
var tFolder = PATH.resolve( __dirname, '../node_modules/fluent-themes/themes', _opts.theme );
var exists = require('./utils/file-exists');
if (!exists( tFolder )) {
tFolder = PATH.resolve( _opts.theme );
Expand Down
2 changes: 1 addition & 1 deletion src/gen/template-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var FS = require( 'fs' )

// Default options.
var _defaultOpts = {
themeRelative: '../../node_modules/watermark/themes',
themeRelative: '../../node_modules/fluent-themes/themes',
keepBreaks: true,
freezeBreaks: true,
nSym: '&newl;', // newline entity
Expand Down

0 comments on commit 783525c

Please sign in to comment.