logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 3a3b556065d34a52843b427fb211d8649f01fe89
parent: 9244f6b6280ccc6645478216b1b2fdd1416572df
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun, 23 Jul 2017 20:28:06 +0200

Improve noscript message and style (#4315)


Diffstat:

Mapp/javascript/styles/components.scss18++++++++++++++++--
Mapp/views/home/index.html.haml3++-
Mconfig/locales/en.yml2+-
3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss @@ -3723,12 +3723,26 @@ button.icon-button.active i.fa-retweet { noscript { text-align: center; + img { + width: 200px; + opacity: 0.5; + animation: flicker 4s infinite; + } + div { - font-size: 20px; - margin: 20px 0; + font-size: 14px; + margin: 30px auto; + color: $ui-secondary-color; + max-width: 400px; } } +@keyframes flicker { + 0% { opacity: 1; } + 30% { opacity: 0.75; } + 100% { opacity: 1; } +} + @media screen and (max-width: 1024px) and (max-height: 400px) { $duration: 400ms; $delay: 100ms; diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml @@ -6,6 +6,7 @@ .app-holder#mastodon{ data: { props: Oj.dump(default_props) } } %noscript - = image_tag asset_pack_path('logo.svg') + = image_tag asset_pack_path('logo.svg'), alt: 'Mastodon' + %div = t('errors.noscript') diff --git a/config/locales/en.yml b/config/locales/en.yml @@ -272,7 +272,7 @@ en: content: Security verification failed. Are you blocking cookies? title: Security verification failed '429': Throttled - noscript: To use Mastodon, please enable JavaScript. + noscript: To use the Mastodon web application, please enable JavaScript. Alternatively, find a native app for Mastodon for your platform. exports: blocks: You block csv: CSV