mastofe

commit: c9fd6f386c5ae0938f1f9c2d1134508e66231e23
parent: 1b5d26735e46719eba4dac4b79719460d7bbba63
Author: TheInventrix <TheInventrix@users.noreply.github.com>
Date:   Mon,  7 Aug 2017 17:50:15 -0600

unify short description styling (#4548)

apply same style class to the About description on both the landing page
and the about/more page
Diffstat:
M
app/javascript/styles/about.scss
2
+-
M
app/views/about/more.html.haml
10
++++++----
M
app/views/about/show.html.haml
5
+++--

3 files changed, 10 insertions(+), 7 deletions(-)
diff --git 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
@@ -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
@@ -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