diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /app/views/about | |
parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'app/views/about')
-rw-r--r-- | app/views/about/more.html.haml | 4 | ||||
-rw-r--r-- | app/views/about/show.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 6d621ce8b..99d7d2972 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -63,9 +63,9 @@ .footer-links .container %p - = link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon' + = link_to t('about.source_code'), @instance_presenter.source_url - if @instance_presenter.commit_hash == "" - %strong= @instance_presenter.version_number + %strong= " (#{@instance_presenter.version_number})" - else %strong= "#{@instance_presenter.version_number}, " %strong= "#{@instance_presenter.commit_hash}" diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 3e04dd038..5962436fc 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -58,7 +58,7 @@ = @instance_presenter.closed_registrations_message.html_safe = link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block' - .learn-more-cta + .about-short .container %h3= t('about.description_headline', domain: site_hostname) %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) @@ -76,7 +76,7 @@ .footer-links .container %p - = link_to t('about.source_code'), 'https://github.com/glitch-soc/mastodon' + = link_to t('about.source_code'), @instance_presenter.source_url - if @instance_presenter.commit_hash == "" %strong= " (#{@instance_presenter.version_number})" - else |