]> cat aescling's git repositories - mastodon.git/commitdiff
unify short description styling (#4548)
authorTheInventrix <TheInventrix@users.noreply.github.com>
Mon, 7 Aug 2017 23:50:15 +0000 (17:50 -0600)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 7 Aug 2017 23:50:15 +0000 (01:50 +0200)
apply same style class to the About description on both the landing page
and the about/more page

app/javascript/styles/about.scss
app/views/about/more.html.haml
app/views/about/show.html.haml

index d409c821495ae7017bae0dc6c5a33b959ff19e9b..62143246f6280901e1b7b8cc8d70842ae1ce88e7 100644 (file)
     padding: 0;
   }
 
-  .learn-more-cta {
+  .about-short {
     background: darken($ui-base-color, 4%);
     padding: 50px 0;
   }
index 6342c72481512079cf9250232ec8cecbb50c91e4..189b3bf1e9cf20f885cfefed8aff845fdd6e1cd6 100644 (file)
               %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
index d0c9a66506ab2b11b664828820774eba3fafdea5..acdb12ad72c0392e6f968f1972abf80c8f4ec480 100644 (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})"
\ No newline at end of file