diff --git a/onionshare/web.py b/onionshare/web.py index 5d1d0cb8..3fa9ed7b 100644 --- a/onionshare/web.py +++ b/onionshare/web.py @@ -73,7 +73,7 @@ class Web(object): self.zip_filesize = None self.security_headers = [ - ('Content-Security-Policy', 'default-src \'self\'; style-src \'unsafe-inline\'; script-src \'unsafe-inline\'; img-src \'self\' data:;'), + ('Content-Security-Policy', 'default-src \'self\'; style-src \'self\'; script-src \'unsafe-inline\'; img-src \'self\' data:;'), ('X-Frame-Options', 'DENY'), ('X-Xss-Protection', '1; mode=block'), ('X-Content-Type-Options', 'nosniff'), diff --git a/share/static/css/404.css b/share/static/css/404.css new file mode 100644 index 00000000..e8f377ca --- /dev/null +++ b/share/static/css/404.css @@ -0,0 +1,6 @@ +body { + background-color: #FFC4D5; + color: #FF0048; + text-align: center; + font-size: 20em; +} diff --git a/share/static/css/denied.css b/share/static/css/denied.css new file mode 100644 index 00000000..260a3dab --- /dev/null +++ b/share/static/css/denied.css @@ -0,0 +1,7 @@ +body { + background-color: #222222; + color: #ffffff; + text-align: center; + font-family: sans-serif; + padding: 5em 1em; +} diff --git a/share/static/css/style.css b/share/static/css/style.css new file mode 100644 index 00000000..dc20f24d --- /dev/null +++ b/share/static/css/style.css @@ -0,0 +1,88 @@ +.clearfix:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} + +body { + margin: 0; + font-family: Helvetica; +} + +header { + border-bottom: 1px solid rgba(0, 0, 0, 0.1); + background: #fcfcfc; + background: -webkit-linear-gradient(top, #fcfcfc 0%, #f2f2f2 100%); + padding: 0.8rem; +} + +header .logo { + vertical-align: middle; + width: 45px; + height: 45px; +} + +header h1 { + display: inline-block; + margin: 0 0 0 0.5rem; + vertical-align: middle; + font-weight: normal; + font-size: 1.5rem; + color: #666666; +} + +header .right { + float: right; + font-size: .75rem; +} + +header .right ul li { + display: inline; + margin: 0 0 0 .5rem; + font-size: 1rem; +} + +header .button { + color: #ffffff; + background-color: #4e064f; + padding: 10px; + border-radius: 5px; + text-decoration: none; + margin-left: 1rem; + cursor: pointer; +} + +table.file-list { + width: 100%; + margin: 0 auto; + border-collapse: collapse; +} + +table.file-list th { + text-align: left; + text-transform: uppercase; + font-weight: normal; + color: #666666; + padding: 0.5rem; +} + +table.file-list tr { + border-bottom: 1px solid #e0e0e0; +} + +table.file-list td { + white-space: nowrap; + padding: 0.5rem 10rem 0.5rem 0.8rem; +} + +table.file-list td img { + vertical-align: middle; + margin-right: 0.5rem; +} + +table.file-list td:last-child { + width: 100%; +} diff --git a/share/static/favicon.ico b/share/static/img/favicon.ico similarity index 100% rename from share/static/favicon.ico rename to share/static/img/favicon.ico diff --git a/share/static/logo.png b/share/static/img/logo.png similarity index 100% rename from share/static/logo.png rename to share/static/img/logo.png diff --git a/share/static/web_file.png b/share/static/img/web_file.png similarity index 100% rename from share/static/web_file.png rename to share/static/img/web_file.png diff --git a/share/static/web_folder.png b/share/static/img/web_folder.png similarity index 100% rename from share/static/web_folder.png rename to share/static/img/web_folder.png diff --git a/share/templates/404.html b/share/templates/404.html index ce70597f..1cf9d7a2 100644 --- a/share/templates/404.html +++ b/share/templates/404.html @@ -2,15 +2,8 @@ Error 404 - - + + 404 diff --git a/share/templates/denied.html b/share/templates/denied.html index 7535e0b4..39974639 100644 --- a/share/templates/denied.html +++ b/share/templates/denied.html @@ -2,16 +2,8 @@ OnionShare - - + +

OnionShare download in progress

diff --git a/share/templates/receive.html b/share/templates/receive.html index 633991a8..42fe35d2 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -2,102 +2,13 @@ OnionShare - - + +
- +

OnionShare

diff --git a/share/templates/send.html b/share/templates/send.html index 1814d214..07bd76bb 100644 --- a/share/templates/send.html +++ b/share/templates/send.html @@ -2,97 +2,8 @@ OnionShare - - + + @@ -105,7 +16,7 @@
  • Download Files
    • - +

    OnionShare

    @@ -118,7 +29,7 @@ {% for info in file_info.dirs %} - + {{ info.basename }} {{ info.size_human }} @@ -128,7 +39,7 @@ {% for info in file_info.files %} - + {{ info.basename }} {{ info.size_human }}