From 9c5adaee276c1c6bab3c8ce4ba397128aff2e731 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sat, 23 Feb 2019 13:16:06 +1100 Subject: Make progress, noscript warning, and flashes appear above the form, but beneath the logo --- share/static/css/style.css | 10 +++++----- share/templates/receive.html | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/share/static/css/style.css b/share/static/css/style.css index 0751d306..3b6a3785 100644 --- a/share/static/css/style.css +++ b/share/static/css/style.css @@ -176,7 +176,7 @@ ul.flashes { margin: 0; padding: 0; width: 800px; - max-width: 90%; + max-width: 500px; margin: 0 auto; } @@ -184,7 +184,7 @@ ul.flashes li { margin: 0 0 5px 0; padding: 5px; list-style: none; - text-align: left; + text-align: center; } li.error { @@ -225,12 +225,12 @@ li.info { div#noscript { border: 1px solid #e55454; - text-align: left; + text-align: center; color: #e55454; padding: 1em; line-height: 150%; - max-width: 900px; - margin: 100px 2em 0 2em; + max-width: 500px; + margin: 0 auto; } div#noscript a, div#noscript a:visited { diff --git a/share/templates/receive.html b/share/templates/receive.html index a557a967..2fff3cdd 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -18,11 +18,6 @@

Send Files

Select the files you want to send, then click "Send Files"...

-
-

-

-
-
@@ -51,6 +46,11 @@
+
+

+

+
+ -- cgit v1.2.3-54-g00ecf From 3f7c83c321ee6047bb21f843aa9ac994410a27f1 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 24 Feb 2019 10:22:44 +1100 Subject: Move the noscript warning to top of page and make it appear less of an error, per more recommendations (and with supplied svg) from @ninavizz --- share/static/css/style.css | 12 ++++++++---- share/templates/receive.html | 29 +++++++++++++++-------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/share/static/css/style.css b/share/static/css/style.css index 3b6a3785..2600ab35 100644 --- a/share/static/css/style.css +++ b/share/static/css/style.css @@ -224,17 +224,21 @@ li.info { } div#noscript { - border: 1px solid #e55454; text-align: center; - color: #e55454; + color: #d709df; padding: 1em; line-height: 150%; - max-width: 500px; + max-width: 700px; margin: 0 auto; } div#noscript a, div#noscript a:visited { - color: #e27f7f; + color: #d709df; +} + +div#noscript svg { + fill: #d709df; + max-width: 30px; } .disable-noscript-xss-wrapper { diff --git a/share/templates/receive.html b/share/templates/receive.html index 2fff3cdd..5b7ab23c 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -13,6 +13,20 @@
+ +
+

+ Fill 1 Created with Sketch. + Warning: Due to a bug in Tor Browser and Firefox, uploads + sometimes never finish. To upload reliably, either set your Tor Browser + security slider + to Standard or + turn off your Tor Browser's NoScript XSS setting.

+
+

Send Files

@@ -32,26 +46,13 @@
- -
-

- Warning: Due to a bug in Tor Browser and Firefox, uploads - sometimes never finish. To upload reliably, either set your Tor Browser - security slider - to Standard or - turn off your Tor Browser's NoScript XSS setting.

-
- -

+ -- cgit v1.2.3-54-g00ecf From a928b369b0cdf7ba6cc851a3b1fa071de7b7d47e Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 25 Feb 2019 14:26:29 +1100 Subject: remove unnecessary bit of css --- share/static/css/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/share/static/css/style.css b/share/static/css/style.css index 2600ab35..987f08f5 100644 --- a/share/static/css/style.css +++ b/share/static/css/style.css @@ -237,7 +237,6 @@ div#noscript a, div#noscript a:visited { } div#noscript svg { - fill: #d709df; max-width: 30px; } -- cgit v1.2.3-54-g00ecf From f2314f24c7b6ca9b9ae3b852a1822174a23ddbd1 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Mon, 11 Mar 2019 17:27:17 +1100 Subject: Use png rather than svg for warning image. Concatenate flash messages with commas to reduce page height. Allow warning message to be wider --- onionshare/web/receive_mode.py | 12 +++++++----- share/static/css/style.css | 5 ----- share/static/img/warning.png | Bin 0 -> 804 bytes share/templates/receive.html | 3 +-- 4 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 share/static/img/warning.png diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index d6ef86ad..25d7aa1b 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -112,12 +112,14 @@ class ReceiveModeWeb(object): else: flash(msg, 'info') else: + msg = 'Sent ' for filename in filenames: - msg = 'Sent {}'.format(filename) - if ajax: - info_flashes.append(msg) - else: - flash(msg, 'info') + msg += '{}, '.format(filename) + msg = msg.rstrip(', ') + if ajax: + info_flashes.append(msg) + else: + flash(msg, 'info') if self.can_upload: if ajax: diff --git a/share/static/css/style.css b/share/static/css/style.css index 987f08f5..e445e5de 100644 --- a/share/static/css/style.css +++ b/share/static/css/style.css @@ -228,7 +228,6 @@ div#noscript { color: #d709df; padding: 1em; line-height: 150%; - max-width: 700px; margin: 0 auto; } @@ -236,10 +235,6 @@ div#noscript a, div#noscript a:visited { color: #d709df; } -div#noscript svg { - max-width: 30px; -} - .disable-noscript-xss-wrapper { max-width: 900px; margin: 0 auto; diff --git a/share/static/img/warning.png b/share/static/img/warning.png new file mode 100644 index 00000000..9be8cbaf Binary files /dev/null and b/share/static/img/warning.png differ diff --git a/share/templates/receive.html b/share/templates/receive.html index 5b7ab23c..a93537c5 100644 --- a/share/templates/receive.html +++ b/share/templates/receive.html @@ -19,8 +19,7 @@ -->

- Fill 1 Created with Sketch. - Warning: Due to a bug in Tor Browser and Firefox, uploads + Warning: Due to a bug in Tor Browser and Firefox, uploads sometimes never finish. To upload reliably, either set your Tor Browser security slider to Standard or -- cgit v1.2.3-54-g00ecf