JuanCanham/HackMyResume
1
0
Fork 0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2024-11-05 09:56:22 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -24,17 +24,16 @@
}, },
"homepage": "https://github.com/fluentdesk/fluentcmd", "homepage": "https://github.com/fluentdesk/fluentcmd",
"dependencies": { "dependencies": {
"mkdirp": "^0.5.1", "fluent-themes": "0.1.0-beta",
"underscore": "^1.8.3",
"fs-extra": "^0.24.0", "fs-extra": "^0.24.0",
"html": "0.0.10", "html": "0.0.10",
"is-my-json-valid": "^2.12.2", "is-my-json-valid": "^2.12.2",
"jst": "0.0.13", "jst": "0.0.13",
"marked": "^0.3.5", "marked": "^0.3.5",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"moment": "^2.10.6", "moment": "^2.10.6",
"underscore": "^1.8.3", "underscore": "^1.8.3",
"watermark": "fluentdesk/watermark#v0.3.1-alpha",
"wkhtmltopdf": "^0.1.5", "wkhtmltopdf": "^0.1.5",
"xml-escape": "^1.0.0", "xml-escape": "^1.0.0",
"yamljs": "^0.2.4" "yamljs": "^0.2.4"

2
src/fluentcmd.js
View File

@ -51,7 +51,7 @@ module.exports = function () {
// Load the active theme // Load the active theme
// Verify the specified theme name/path // 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'); var exists = require('./utils/file-exists');
if (!exists( tFolder )) { if (!exists( tFolder )) {
tFolder = PATH.resolve( _opts.theme ); tFolder = PATH.resolve( _opts.theme );

2
src/gen/template-generator.js
View File

@ -14,7 +14,7 @@ var FS = require( 'fs' )
// Default options. // Default options.
var _defaultOpts = { var _defaultOpts = {
themeRelative: '../../node_modules/watermark/themes', themeRelative: '../../node_modules/fluent-themes/themes',
keepBreaks: true, keepBreaks: true,
freezeBreaks: true, freezeBreaks: true,
nSym: '&newl;', // newline entity nSym: '&newl;', // newline entity