From 087e11897137dc1f2811c21c3ccc6cec3ccdedb3 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 17 Dec 2018 03:14:28 +0100 Subject: Remove "most popular" tab from profile directory, add responsive design (#9539) * Remove "most popular" tab from profile directory, add responsive design * Remove unused translations --- app/views/layouts/public.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/layouts') diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 93ed12f18..caccd5bb6 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -10,9 +10,9 @@ = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' - if Setting.profile_directory - = link_to t('directories.directory'), explore_path, class: 'nav-link' - = link_to t('about.about_this'), about_more_path, class: 'nav-link' - = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link' + = link_to t('directories.directory'), explore_path, class: 'nav-link optional' + = link_to t('about.about_this'), about_more_path, class: 'nav-link optional' + = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional' .nav-center .nav-right - if user_signed_in? -- cgit From 0c2d48b60af9e7fb3b2fcc54d1f4e706d2242e0e Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 17 Dec 2018 14:47:00 +0100 Subject: Replace animated oops.gif by a non-animated image Fixes #6060 --- app/views/layouts/error.html.haml | 2 +- public/oops.png | Bin 0 -> 26661 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/oops.png (limited to 'app/views/layouts') diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index be3e9f105..c9afbb5c8 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -9,6 +9,6 @@ = render partial: 'layouts/theme', object: (@theme || { pack: 'common', flavour: 'glitch', skin: 'default' }) %body.error .dialog - %img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/ + %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/ %div %h1= yield :content diff --git a/public/oops.png b/public/oops.png new file mode 100644 index 000000000..0a48cbf94 Binary files /dev/null and b/public/oops.png differ -- cgit From e8d5affe067a07c58853a14623857b68a0e65c09 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 18 Dec 2018 23:15:30 +0100 Subject: Restore oops.gif animation for user who have auto_play_gif set --- app/views/layouts/error.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/layouts') diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index c9afbb5c8..d662d85e2 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -9,6 +9,6 @@ = render partial: 'layouts/theme', object: (@theme || { pack: 'common', flavour: 'glitch', skin: 'default' }) %body.error .dialog - %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/ + %img{ alt: Setting.default_settings['site_title'], src: current_user&.setting_auto_play_gif ? '/oops.gif' : '/oops.png' }/ %div %h1= yield :content -- cgit