1
0
mirror of https://github.com/JuanCanham/HackMyResume.git synced 2025-05-15 01:57:08 +01:00

Compare commits

..

5 Commits

Author SHA1 Message Date
JD
d2791014ef Merge pull request #19 from fluentdesk/rel/v0.9.1
Rel/v0.9.1
2015-11-24 10:52:20 -05:00
e51eb270fc Bump versions. 2015-11-24 10:57:04 -05:00
fbc98060ce Fix theme loading glitch. 2015-11-24 10:56:28 -05:00
af33b6eded Merge branch 'refs/heads/feat/fresh' 2015-11-22 03:19:15 -05:00
51a44ce4a8 Merge remote-tracking branch 'refs/remotes/origin/master' into feat/fresh 2015-11-22 03:19:01 -05:00
2 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "fluentcv", "name": "fluentcv",
"version": "0.9.0", "version": "0.9.1",
"description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.", "description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.",
"repository": { "repository": {
"type": "git", "type": "git",
@ -34,7 +34,7 @@
"dependencies": { "dependencies": {
"FRESCA": "fluentdesk/FRESCA#v0.1.0", "FRESCA": "fluentdesk/FRESCA#v0.1.0",
"colors": "^1.1.2", "colors": "^1.1.2",
"fluent-themes": "0.5.0-beta", "fluent-themes": "0.5.1-beta",
"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",

View File

@ -14,7 +14,6 @@ var FS = require( 'fs' )
// Default options. // Default options.
var _defaultOpts = { var _defaultOpts = {
themeRelative: '../../node_modules/fluent-themes/themes',
keepBreaks: true, keepBreaks: true,
freezeBreaks: true, freezeBreaks: true,
nSym: '&newl;', // newline entity nSym: '&newl;', // newline entity
@ -76,7 +75,10 @@ var TemplateGenerator = module.exports = BaseGenerator.extend({
this.opts = EXTEND( true, { }, _defaultOpts, opts ); this.opts = EXTEND( true, { }, _defaultOpts, opts );
// Verify the specified theme name/path // Verify the specified theme name/path
var tFolder = PATH.resolve( __dirname, this.opts.themeRelative, this.opts.theme ); var tFolder = PATH.join(
PATH.parse( require.resolve('fluent-themes') ).dir,
this.opts.theme
);
var exists = require('../utils/file-exists'); var exists = require('../utils/file-exists');
if (!exists( tFolder )) { if (!exists( tFolder )) {
tFolder = PATH.resolve( this.opts.theme ); tFolder = PATH.resolve( this.opts.theme );