diff --git a/README.md b/README.md index 34e6dcef..685c3fc1 100644 --- a/README.md +++ b/README.md @@ -48,20 +48,3 @@ Pull requests are always welcome! Feel free to check out the list of ["good firs ## License [Mozilla Public License Version 2.0](LICENSE) - - **Entypo** - - Copyright (C) 2012 by Daniel Bruce - - Author: Daniel Bruce - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://www.entypo.com - - - **Font Awesome** - - Copyright (C) 2016 by Dave Gandy - - Author: Dave Gandy - License: SIL () - Homepage: http://fortawesome.github.com/Font-Awesome/ diff --git a/frontend/src/upload.js b/frontend/src/upload.js index 9527489a..319e35cb 100644 --- a/frontend/src/upload.js +++ b/frontend/src/upload.js @@ -47,7 +47,7 @@ $(document).ready(function() { //disable button for 3s $copyBtn.attr('disabled', true); $('#link').attr('disabled', true); - $copyBtn.html(''); + $copyBtn.html(''); window.setTimeout(() => { $copyBtn.attr('disabled', false); $('#link').attr('disabled', false); @@ -229,10 +229,10 @@ $(document).ready(function() { name.appendChild(cellText); // create delete button - del.innerHTML = ''; + del.innerHTML = ''; - link.innerHTML = ''; - link.style.color = '#0A8DFF'; + link.innerHTML = ''; + link.style.color = '#0A8DFF'; //font colour //copy link to clipboard when icon clicked $(link).click(function() { const aux = document.createElement('input'); @@ -243,7 +243,7 @@ $(document).ready(function() { document.body.removeChild(aux); link.innerHTML = 'Copied!'; window.setTimeout(() => { - link.innerHTML = ''; + link.innerHTML = ''; }, 500); }); diff --git a/public/main.css b/public/main.css index 02a1f69a..2ff4b087 100644 --- a/public/main.css +++ b/public/main.css @@ -35,10 +35,6 @@ a { text-decoration: none; } -span { - cursor: pointer; -} - /** page-one **/ .title { font-size: 33px; @@ -146,6 +142,10 @@ tbody { table-layout: fixed; } +.icon-delete, .icon-copy, .icon-check { + cursor: pointer; +} + /* Popup container */ .popup { position: relative; @@ -166,7 +166,7 @@ tbody { z-index: 1; bottom: 20px; left: 50%; - margin-left: -96px; + margin-left: -88px; transition: opacity 0.5s; opacity: 0; outline: 0; diff --git a/public/resources/check-16.svg b/public/resources/check-16.svg new file mode 100644 index 00000000..84fb098d --- /dev/null +++ b/public/resources/check-16.svg @@ -0,0 +1,4 @@ + + diff --git a/public/resources/close-16.svg b/public/resources/close-16.svg new file mode 100644 index 00000000..1b6d5163 --- /dev/null +++ b/public/resources/close-16.svg @@ -0,0 +1,4 @@ + + diff --git a/public/resources/copy-16.svg b/public/resources/copy-16.svg new file mode 100644 index 00000000..dbaf75db --- /dev/null +++ b/public/resources/copy-16.svg @@ -0,0 +1,4 @@ + + diff --git a/public/resources/fontello-24c5e6ad/config.json b/public/resources/fontello-24c5e6ad/config.json deleted file mode 100755 index 3a91a711..00000000 --- a/public/resources/fontello-24c5e6ad/config.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "", - "css_prefix_text": "icon-", - "css_use_suffix": false, - "hinting": true, - "units_per_em": 1000, - "ascent": 850, - "glyphs": [ - { - "uid": "c8585e1e5b0467f28b70bce765d5840c", - "css": "docs", - "code": 61637, - "src": "fontawesome" - }, - { - "uid": "c709da589c923ba3c2ad48d9fc563e93", - "css": "cancel-1", - "code": 59393, - "src": "entypo" - }, - { - "uid": "14017aae737730faeda4a6fd8fb3a5f0", - "css": "check", - "code": 59394, - "src": "entypo" - } - ] -} \ No newline at end of file diff --git a/public/resources/fontello-24c5e6ad/css/fontello.css b/public/resources/fontello-24c5e6ad/css/fontello.css deleted file mode 100755 index ea18ff91..00000000 --- a/public/resources/fontello-24c5e6ad/css/fontello.css +++ /dev/null @@ -1,60 +0,0 @@ -@font-face { - font-family: 'fontello'; - src: url('../font/fontello.eot?60405031'); - src: url('../font/fontello.eot?60405031#iefix') format('embedded-opentype'), - url('../font/fontello.woff2?60405031') format('woff2'), - url('../font/fontello.woff?60405031') format('woff'), - url('../font/fontello.ttf?60405031') format('truetype'), - url('../font/fontello.svg?60405031#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} -/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ -/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ -/* -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: 'fontello'; - src: url('../font/fontello.svg?60405031#fontello') format('svg'); - } -} -*/ - - [class^="icon-"]:before, [class*=" icon-"]:before { - font-family: "fontello"; - font-style: normal; - font-weight: normal; - speak: none; - - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - /* opacity: .8; */ - - /* For safety - reset parent styles, that can break glyph codes*/ - font-variant: normal; - text-transform: none; - - /* fix buttons height, for twitter bootstrap */ - line-height: 1em; - - /* Animation center compensation - margins should be symmetric */ - /* remove if not needed */ - margin-left: .2em; - - /* you can be more comfortable with increased icons size */ - /* font-size: 120%; */ - - /* Font smoothing. That was taken from TWBS */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - /* Uncomment for 3D effect */ - /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ -} - -.icon-cancel-1:before { content: '\e801'; font-size: 1.5em; font-weight: lighter;} /* '' */ -.icon-check:before { content: '\e802'; font-size: 1.5em;} /* '' */ -.icon-docs:before { content: '\f0c5'; font-weight: bolder;} /* '' */ diff --git a/public/resources/fontello-24c5e6ad/font/fontello.eot b/public/resources/fontello-24c5e6ad/font/fontello.eot deleted file mode 100755 index 30b0ddc1..00000000 Binary files a/public/resources/fontello-24c5e6ad/font/fontello.eot and /dev/null differ diff --git a/public/resources/fontello-24c5e6ad/font/fontello.svg b/public/resources/fontello-24c5e6ad/font/fontello.svg deleted file mode 100755 index 431b9d7c..00000000 --- a/public/resources/fontello-24c5e6ad/font/fontello.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - -Copyright (C) 2017 by original authors @ fontello.com - - - - - - - - - - - - \ No newline at end of file diff --git a/public/resources/fontello-24c5e6ad/font/fontello.ttf b/public/resources/fontello-24c5e6ad/font/fontello.ttf deleted file mode 100755 index 86b99e44..00000000 Binary files a/public/resources/fontello-24c5e6ad/font/fontello.ttf and /dev/null differ diff --git a/public/resources/fontello-24c5e6ad/font/fontello.woff b/public/resources/fontello-24c5e6ad/font/fontello.woff deleted file mode 100755 index 25766584..00000000 Binary files a/public/resources/fontello-24c5e6ad/font/fontello.woff and /dev/null differ diff --git a/public/resources/fontello-24c5e6ad/font/fontello.woff2 b/public/resources/fontello-24c5e6ad/font/fontello.woff2 deleted file mode 100755 index ca749888..00000000 Binary files a/public/resources/fontello-24c5e6ad/font/fontello.woff2 and /dev/null differ diff --git a/public/resources/send_logo_type.svg b/public/resources/send_logo_type.svg index fc8f9ada..8eb7bc32 100644 --- a/public/resources/send_logo_type.svg +++ b/public/resources/send_logo_type.svg @@ -1,13 +1,16 @@ - + - Send + logo design_01 copy Created with Sketch. -
-
- {{#if filename}} -
-
- Download {{filename}} ({{filesize}}) -
-
- Your friend is sending you a file with Firefox Send, a service that allows you to share files with a safe, private, and encrypted link that automatically expires to ensure your stuff does not remain online forever. -
- Download -
- -
-
- -
-
- Downloading {{filename}} ({{filesize}}) -
-
- Please leave this tab open while we fetch your file and decrypt it. -
- -
-
- - % -
-
-
-
{{filename}}
-
-
- - - Try Firefox Send - - {{else}} +
+ {{#if filename}} +
- This link has expired or never existed in the first place. + Download {{filename}} ({{filesize}})
- - diff --git a/views/index.handlebars b/views/index.handlebars index 121e9d85..df4a0266 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -1,113 +1,105 @@ -