logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f91284d230c261baa6adc1764cad08b561c5ba67
parent: feadf7553dbdc4b0db5cabe6c62791232b59f8aa
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Sun, 30 Jul 2017 23:24:18 +0900

Do not create empty a element when there is no e-mail (#4455)

Empty a element is created when there is no business e-mail input.

Diffstat:

Mapp/javascript/styles/about.scss6+++++-
Mapp/views/about/_contact.html.haml5++++-
2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss @@ -147,9 +147,13 @@ white-space: nowrap; overflow: hidden; - a { + a, + span { font-weight: 400; color: lighten($ui-base-color, 34%); + } + + a { text-decoration: none; } } diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml @@ -2,7 +2,10 @@ .panel-header = succeed ':' do = t 'about.contact' - = mail_to contact.site_contact_email.presence, nil, :title => contact.site_contact_email.presence + - if contact.site_contact_email.present? + = mail_to contact.site_contact_email, nil, title: contact.site_contact_email + - else + %span= t 'about.contact_unavailable' .panel-body - if contact.contact_account .owner