natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #415 from pdehaan/de-fira 

Only include Fira CSS on /unsupported/* route
This commit is contained in:
Danny Coates 2017-08-03 11:50:46 -07:00 committed by GitHub
parent 434f8b56cc 705289d34b
commit 95e3ca7a1c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/server.js
View File

@ -96,7 +96,8 @@ app.get('/', (req, res) => {
app.get('/unsupported/:reason', (req, res) => { app.get('/unsupported/:reason', (req, res) => {
const outdated = req.params.reason === 'outdated'; const outdated = req.params.reason === 'outdated';
res.render('unsupported', { res.render('unsupported', {
outdated: outdated outdated,
fira: true
}); });
}); });

15
views/layouts/main.handlebars
View File

@ -1,17 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Firefox Send</title> <meta charset="utf-8" />
<script src="/jsconfig.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="defaultLanguage" content="en-US"> <meta name="defaultLanguage" content="en-US">
<meta name="availableLanguages" content="{{availableLanguages}}"> <meta name="availableLanguages" content="{{availableLanguages}}">
<title>Firefox Send</title>
<link rel="stylesheet" type="text/css" href="/main.css" />
{{#if fira}}
<link rel="stylesheet" type="text/css" href="https://code.cdn.mozilla.net/fonts/fira.css" />
{{/if}}
<link rel="icon" type="image/png" href="/resources/favicon-32x32.png" sizes="32x32" /> <link rel="icon" type="image/png" href="/resources/favicon-32x32.png" sizes="32x32" />
<link rel="localization" href="/locales/{locale}/send.ftl"> <link rel="localization" href="/locales/{locale}/send.ftl">
<script src="/jsconfig.js"></script>
<script src="/polyfill.min.js"></script> <script src="/polyfill.min.js"></script>
<script defer src="/l20n.min.js"></script> <script defer src="/l20n.min.js"></script>
</head> </head>