removed deprecated cssSrc, replaced with optional bootswatchCSS

v1.18.x
psychobunny 11 years ago
parent df53d836e5
commit 025e1293fa

@ -4,7 +4,9 @@
<title>{browserTitle}</title>
{meta_tags}
<link rel="icon" type="image/x-icon" href="{brand:favicon}" />
<link href="{cssSrc}" rel="stylesheet" media="screen">
<!-- IF bootswatchCSS -->
<link href="{bootswatchCSS}" rel="stylesheet" media="screen">
<!-- ENDIF bootswatchCSS -->
<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css?{cache-buster}" />
{link_tags}

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

Loading…
Cancel
Save