about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSorin Davidoi <sorin.davidoi@gmail.com>2017-06-08 00:52:56 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-06-08 00:52:56 +0200
commit8acadeea7622e7ed828b9bba494a9fdd9370ad29 (patch)
treee81d6959808aa229a2c8485f6c9bf295480e05dd
parent75c6513c678148e9a6adfcda57cfd5c8a16c804a (diff)
fix: Warn if JavaScript is disabled (#3634)
-rw-r--r--app/javascript/styles/components.scss9
-rw-r--r--app/views/home/index.html.haml4
-rw-r--r--config/locales/en.yml1
3 files changed, 14 insertions, 0 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 502674225..6fa3c8dff 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3629,3 +3629,12 @@ button.icon-button.active i.fa-retweet {
     border-color: transparent transparent $ui-base-color;
   }
 }
+
+noscript {
+  text-align: center;
+
+  div {
+    font-size: 20px;
+    margin: 20px 0;
+  }
+}
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 87cfcaff4..33c978c89 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -4,3 +4,7 @@
   = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
 
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
+  %noscript
+    = image_tag asset_pack_path('logo.png')
+    %div
+      = t('errors.noscript')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 965bfbe47..6ea2eb6c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -231,6 +231,7 @@ en:
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
     '429': Throttled
+    noscript: To use Mastodon, please enable JavaScript.
   exports:
     blocks: You block
     csv: CSV