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

Merge pull request #231 from mozilla/ui 

move head and html tags to main template
This commit is contained in:
Danny Coates 2017-07-18 12:33:51 -07:00 committed by GitHub
parent e4a724422e 4068291f7c
commit 45eccc1cad
4 changed files with 183 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/main.css
View File

@ -23,7 +23,7 @@ body {
} }
.all { .all {
padding-top: 12%; padding-top: 10%;
overflow-y: scroll; overflow-y: scroll;
} }

25
views/download.handlebars
View File

@ -1,22 +1,9 @@
<!DOCTYPE html>
<html> <div class="send-logo">
<head>
<title>Download your file</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
<div class="send-logo">
<img src="/resources/send_logo.svg"/> <img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/> <img src="/resources/send_logo_type.svg"/>
</div> </div>
<div class="all"> <div class="all">
<div id="download"> <div id="download">
{{#if filename}} {{#if filename}}
<div id="download-page-one"> <div id="download-page-one">
@ -70,6 +57,4 @@
</div> </div>
{{/if}} {{/if}}
</div> </div>
</div> </div>
</body>
</html>

26
views/index.handlebars
View File

@ -1,24 +1,8 @@
<!DOCTYPE html> <div class="send-logo">
<html>
<head>
<title>Firefox Send</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
<link rel="stylesheet" type="text/css" href="/resources/fontello-24c5e6ad/css/fontello.css" />
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
<div class="send-logo">
<img src="/resources/send_logo.svg"/> <img src="/resources/send_logo.svg"/>
<img src="/resources/send_logo_type.svg"/> <img src="/resources/send_logo_type.svg"/>
</div> </div>
<div class="all"> <div class="all">
<div id="page-one"> <div id="page-one">
<div class="title"> <div class="title">
Private, Encrypted File Sharing Private, Encrypted File Sharing
@ -125,7 +109,5 @@
</div> </div>
</div> </div>
</div>
</div> </div>
</body> </div>
</html>

24
views/layouts/main.handlebars
View File

@ -1,5 +1,21 @@
{{{body}}} <!DOCTYPE html>
<div class="footer"> <html>
<head>
<title>Firefox Send</title>
{{#if dsn}}
{{> sentry dsn=dsn}}
{{/if}}
<script src="/bundle.js"></script>
<link rel="stylesheet" type="text/css" href="/main.css" />
<link rel="stylesheet" type="text/css" href="/resources/fontello-24c5e6ad/css/fontello.css" />
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
{{#if trackerId}}
{{> analytics trackerId=trackerId}}
{{/if}}
</head>
<body>
{{{body}}}
<div class="footer">
<div class="legal-links"> <div class="legal-links">
<a href="https://www.mozilla.org"><img class="mozilla-logo" src="/resources/mozilla-logo.svg"/></a> <a href="https://www.mozilla.org"><img class="mozilla-logo" src="/resources/mozilla-logo.svg"/></a>
<a href="https://www.mozilla.org/about/legal/">Legal</a> <a href="https://www.mozilla.org/about/legal/">Legal</a>
@ -12,4 +28,6 @@
<a href="https://github.com/mozilla/send" target="_blank"><img class="github" src="/resources/github-icon.svg"/></a> <a href="https://github.com/mozilla/send" target="_blank"><img class="github" src="/resources/github-icon.svg"/></a>
<a href="https://twitter.com/FxTestPilot" target="_blank"><img class="twitter" src="/resources/twitter-icon.svg"/></a> <a href="https://twitter.com/FxTestPilot" target="_blank"><img class="twitter" src="/resources/twitter-icon.svg"/></a>
</div> </div>
</div> </div>
</body>
</html>