From c9fd6f386c5ae0938f1f9c2d1134508e66231e23 Mon Sep 17 00:00:00 2001 From: TheInventrix Date: Mon, 7 Aug 2017 17:50:15 -0600 Subject: [PATCH] unify short description styling (#4548) apply same style class to the About description on both the landing page and the about/more page --- app/javascript/styles/about.scss | 2 +- app/views/about/more.html.haml | 9 +++++---- app/views/about/show.html.haml | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index d409c82149..62143246f6 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -484,7 +484,7 @@ padding: 0; } - .learn-more-cta { + .about-short { background: darken($ui-base-color, 4%); padding: 50px 0; } diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 6342c72481..189b3bf1e9 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -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})" \ No newline at end of file diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index d0c9a66506..acdb12ad72 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) @@ -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})" \ No newline at end of file