Browse Source

unify short description styling (#4548)

apply same style class to the About description on both the landing page
and the about/more page
master
TheInventrix 7 years ago
committed by Eugen Rochko
parent
commit
c9fd6f386c
3 changed files with 8 additions and 7 deletions
  1. +1
    -1
      app/javascript/styles/about.scss
  2. +5
    -4
      app/views/about/more.html.haml
  3. +2
    -2
      app/views/about/show.html.haml

+ 1
- 1
app/javascript/styles/about.scss View File

@ -484,7 +484,7 @@
padding: 0;
}
.learn-more-cta {
.about-short {
background: darken($ui-base-color, 4%);
padding: 50px 0;
}

+ 5
- 4
app/views/about/more.html.haml View File

@ -35,9 +35,10 @@
%i.fa.fa-external-link{ style: 'padding-left: 5px;' }
.container.hero
.heading
%h3= t('about.description_headline', domain: site_hostname)
%p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
.about-short
.heading
%h3= t('about.description_headline', domain: site_hostname)
%p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
.information-board
.container
@ -64,4 +65,4 @@
.container
%p
= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
= " (#{@instance_presenter.version_number})"
= " (#{@instance_presenter.version_number})"

+ 2
- 2
app/views/about/show.html.haml View File

@ -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)
@ -77,4 +77,4 @@
.container
%p
= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
= " (#{@instance_presenter.version_number})"
= " (#{@instance_presenter.version_number})"

Loading…
Cancel
Save