luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-22 06:43:19 +00:00
Code Issues Projects Releases Wiki Activity

unify short description styling (#4548)

Browse source 
apply same style class to the About description on both the landing page
and the about/more page
This commit is contained in:
TheInventrix 2017-08-07 17:50:15 -06:00 committed by Eugen Rochko
parent 1b5d26735e
commit c9fd6f386c
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/styles/about.scss
View file

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

9
app/views/about/more.html.haml
View file

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

4
app/views/about/show.html.haml
View file

@ -58,7 +58,7 @@
= @instance_presenter.closed_registrations_message.html_safe = @instance_presenter.closed_registrations_message.html_safe
= link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block' = link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block'
.learn-more-cta .about-short
.container .container
%h3= t('about.description_headline', domain: site_hostname) %h3= t('about.description_headline', domain: site_hostname)
%p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname) %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
@ -77,4 +77,4 @@
.container .container
%p %p
= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon' = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
= " (#{@instance_presenter.version_number})" = " (#{@instance_presenter.version_number})"