1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-05 01:56:21 +00:00

Merge pull request #9 from fluentdesk/rfact/fluent-themes

Rename watermark to fluent-themes.
This commit is contained in:
JD 2015-10-26 13:45:39 -04:00
commit 783525c21d
3 changed files with 4 additions and 5 deletions

View File

@ -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"

View File

@ -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 );

View File

@ -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