From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 30 Jul 2017 14:24:18 +0000 (+0900)
Subject: Do not create empty a element when there is no e-mail (#4455)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f91284d230c261baa6adc1764cad08b561c5ba67;p=mastodon.git

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.
---

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 1c5f13e32..d409c8214 100644
--- 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
index 81b7db61f..cf21ad5a3 100644
--- 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