Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed deprecated cssSrc, replaced with optional bootswatchCSS

Browse Source
This commit is contained in:
psychobunny
2014-01-18 16:13:01 -05:00
parent df53d836e5
commit 025e1293fa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/templates/header.tpl
View File

@@ -4,7 +4,9 @@
<title>{browserTitle}</title> <title>{browserTitle}</title>
{meta_tags} {meta_tags}
<link rel="icon" type="image/x-icon" href="{brand:favicon}" /> <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" 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 rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css?{cache-buster}" />
{link_tags} {link_tags}

2
src/webserver.js
View File

@@ -94,7 +94,7 @@ if(nconf.get('ssl')) {
href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png' href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'
}], }],
templateValues = { 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'] : '') }; }), 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 || '', title: meta.config.title || '',
description: meta.config.description || '', description: meta.config.description || '',