diff --git a/frontend/src/download.js b/frontend/src/download.js index ae6fe65d..b19d9078 100644 --- a/frontend/src/download.js +++ b/frontend/src/download.js @@ -32,20 +32,16 @@ $(document).ready(function() { $('.percent-number').html(`${Math.floor(percent * 100)}`); if (progress[1] < 1000000) { $('.progress-text').html( - `${filename} (${(progress[0] / 1000).toFixed(1)}KB of + `${filename} (${(progress[0] / 1000).toFixed(1)}KB of ${(progress[1] / 1000).toFixed(1)}KB)` ); } else if (progress[1] < 1000000000) { $('.progress-text').html( - `${filename} (${(progress[0] / 1000000).toFixed( - 1 - )}MB of ${(progress[1] / 1000000).toFixed(1)}MB)` + `${filename} (${(progress[0] / 1000000).toFixed(1)}MB of ${(progress[1] / 1000000).toFixed(1)}MB)` ); } else { $('.progress-text').html( - `${filename} (${(progress[0] / 1000000).toFixed( - 1 - )}MB of ${(progress[1] / 1000000000).toFixed(1)}GB)` + `${filename} (${(progress[0] / 1000000).toFixed(1)}MB of ${(progress[1] / 1000000000).toFixed(1)}GB)` ); } //on complete diff --git a/public/main.css b/public/main.css index 7a6f778b..1cd9700a 100644 --- a/public/main.css +++ b/public/main.css @@ -11,20 +11,11 @@ html { } body { - height: 100%; + min-height: 100%; + position: relative; } -.footer { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 1rem; - font-size: 15px; - color: #858585; -} - -#all { +.all { padding-top: 12%; overflow-y: scroll; } @@ -33,6 +24,10 @@ input, select, textarea, button { font-family: inherit; } +a { + text-decoration: none; +} + span { cursor: pointer; } @@ -371,7 +366,6 @@ tbody { justify-content: center; align-items: center; line-height: 1; - text-decoration: none; } #dl-firefox-text { @@ -442,3 +436,45 @@ tbody { width: 283px; height: 196px; } + +/* footer */ +.footer { + position: absolute; + right: 0; + bottom: 0; + left: 0; + font-size: 15px; + display: flex; + align-items: flex-end; +} + +.mozilla-logo { + width: 112px; + height: 32px; + margin-bottom: -5px; +} + +.legal-links > a { + margin-right: 30px; + color: #858585; +} + +.legal-links > a:visited { + color: #858585; +} + +.social-links { + display: flex; + justify-content: flex-end; + flex: 1; +} + +.social-links > a { + margin-left: 30px; +} + +.github, .twitter { + width: 32px; + height: 32px; + margin-bottom: -5px; +} diff --git a/public/resources/github-icon.svg b/public/resources/github-icon.svg new file mode 100644 index 00000000..977cf9d7 --- /dev/null +++ b/public/resources/github-icon.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/resources/mozilla-logo.jpg b/public/resources/mozilla-logo.jpg deleted file mode 100644 index 9c27a0cd..00000000 Binary files a/public/resources/mozilla-logo.jpg and /dev/null differ diff --git a/public/resources/mozilla-logo.svg b/public/resources/mozilla-logo.svg new file mode 100644 index 00000000..13e0a1c3 --- /dev/null +++ b/public/resources/mozilla-logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/public/resources/send_logo.svg b/public/resources/send_logo.svg new file mode 100644 index 00000000..af6c16f5 --- /dev/null +++ b/public/resources/send_logo.svg @@ -0,0 +1,21 @@ + + + + send logo + Created with Sketch. + + + diff --git a/public/resources/send_logo_type.svg b/public/resources/send_logo_type.svg new file mode 100644 index 00000000..fc8f9ada --- /dev/null +++ b/public/resources/send_logo_type.svg @@ -0,0 +1,14 @@ + + + + Send + Created with Sketch. + + + diff --git a/public/resources/twitter-icon.svg b/public/resources/twitter-icon.svg new file mode 100644 index 00000000..0b61e76e --- /dev/null +++ b/public/resources/twitter-icon.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/views/download.handlebars b/views/download.handlebars index dfdb86e3..9d98cb60 100644 --- a/views/download.handlebars +++ b/views/download.handlebars @@ -12,7 +12,7 @@ {{/if}} -
+
{{#if filename}}
@@ -51,7 +51,6 @@ Try Firefox Send
{{else}} -
This link has expired or never existed in the first place.
diff --git a/views/index.handlebars b/views/index.handlebars index 273d9879..81c23774 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -14,7 +14,8 @@ {{/if}} -
+
+
Private, Encrypted File Sharing @@ -32,8 +33,8 @@ -
+
@@ -105,23 +106,23 @@ - -
-
- Your browser is not supported. -
-
- Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox! -
- - -
Firefox
Free Download
- -
- Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever. +
+
+ Your browser is not supported. +
+
+ Unfortunately this browser does not support the web technology that powers Firefox Send. You'll need to try another browser. We recommend Firefox! +
+ + +
Firefox
Free Download
+ +
+ Send files through a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever. +
+
- diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index 4839ad4c..ed441195 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -1 +1,15 @@ -{{{body}}} \ No newline at end of file +{{{body}}} +
+
+ + Legal + About Test Pilot + Privacy + Terms + Cookies +
+ +