From d499bb031f0d20a5f27facfd57cf4e00f89003d7 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Thu, 11 Feb 2021 10:18:56 +0900 Subject: [PATCH] Use custom mascot on static share page (#15687) * Use custom mascot on static share page * Use full_asset_url --- app/helpers/mascot_helper.rb | 13 +++++++++++++ app/javascript/styles/mastodon/modal.scss | 13 +++++++++++-- app/views/layouts/modal.html.haml | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 app/helpers/mascot_helper.rb diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb new file mode 100644 index 000000000..0124c74f1 --- /dev/null +++ b/app/helpers/mascot_helper.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module MascotHelper + def mascot_url + full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg')) + end + + private + + def instance_presenter + @instance_presenter ||= InstancePresenter.new + end +end diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss index 962ed1ef5..6c6de4206 100644 --- a/app/javascript/styles/mastodon/modal.scss +++ b/app/javascript/styles/mastodon/modal.scss @@ -12,10 +12,19 @@ flex-direction: column; justify-content: flex-end; - > * { + > div { flex: 1; max-height: 235px; - background: url('../images/elephant_ui_plane.svg') no-repeat left bottom / contain; + position: relative; + + img { + max-height: 100%; + max-width: 100%; + height: 100%; + position: absolute; + bottom: 0; + left: 0; + } } } diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml index e74e2c0e3..a2cd1193f 100644 --- a/app/views/layouts/modal.html.haml +++ b/app/views/layouts/modal.html.haml @@ -14,5 +14,6 @@ .container-alt= yield .modal-layout__mastodon %div + %img{alt:'', draggable:'false', src:"#{mascot_url}"} = render template: 'layouts/application'