From df53d836e5410af3cd34834c512a06ae60d9e2c4 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 18 Jan 2014 16:01:09 -0500 Subject: [PATCH 1/2] fixed dependency check for cerulean --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 3328d3ca1c..bd42c1158b 100644 --- a/app.js +++ b/app.js @@ -81,7 +81,7 @@ winston.info('Base Configuration OK.'); } - if (semver.gt(pkg.dependencies['nodebb-theme-cerulean'], require('./node_modules/nodebb-theme-cerulean/package.json').version)) { + if (!semver.satisfies(require('./node_modules/nodebb-theme-cerulean/package.json').version, pkg.dependencies['nodebb-theme-cerulean'])) { winston.error('nodebb-theme-cerulean is out of date - please run npm install.'); } From 025e1293fa74f7ad652c211ee6ad1d24d17dd587 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 18 Jan 2014 16:13:01 -0500 Subject: [PATCH 2/2] removed deprecated cssSrc, replaced with optional bootswatchCSS --- public/templates/header.tpl | 4 +++- src/webserver.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 1eafdea419..eb651c4b13 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -4,7 +4,9 @@ {browserTitle} {meta_tags} - + + + {link_tags} diff --git a/src/webserver.js b/src/webserver.js index e0e4cdcf89..ca318f0d66 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -94,7 +94,7 @@ if(nconf.get('ssl')) { href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png' }], templateValues = { - cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css', + bootswatchCSS: meta.config['theme:src'], pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }), title: meta.config.title || '', description: meta.config.description || '',