From affd86c1dc765b65bf44218297d7289ff5b338ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 25 Jul 2017 23:30:13 +0200 Subject: [PATCH 1/2] Add .fa-external-link to instance list link --- app/views/about/more.html.haml | 5 ++++- app/views/about/show.html.haml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index ed491495b6..6d621ce8b4 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -29,7 +29,10 @@ - else = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' %li= link_to t('about.about_this'), about_more_path - %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + %li + = link_to 'https://joinmastodon.org/' do + = "#{t('about.other_instances')}" + %i.fa.fa-external-link{ style: 'padding-left: 5px;' } .container.hero .heading diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index b78e181ec2..3e04dd0383 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -33,7 +33,10 @@ - else = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn' %li= link_to t('about.about_this'), about_more_path - %li= link_to t('about.other_instances'), 'https://joinmastodon.org/' + %li + = link_to 'https://joinmastodon.org/' do + = "#{t('about.other_instances')}" + %i.fa.fa-external-link{ style: 'padding-left: 5px;' } .container.hero .floats From f92b25619cf41efbdb3776225487f482ae681548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 25 Jul 2017 23:30:31 +0200 Subject: [PATCH 2/2] Improve landing page CSS and text contrast --- app/javascript/styles/about.scss | 78 ++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss index af1d45a093..deab66ff21 100644 --- a/app/javascript/styles/about.scss +++ b/app/javascript/styles/about.scss @@ -272,6 +272,8 @@ } .landing-page { + $lp-par-color: lighten($ui-base-color, 36%); + .header-wrapper { padding-top: 15px; background: $ui-base-color; @@ -284,6 +286,14 @@ .hero .heading { padding-bottom: 30px; + + p, li { + color: lighten($ui-base-color, 50%); + } + + li { + margin: 2px 0; + } } } @@ -307,13 +317,6 @@ } } - p, - li { - font: inherit; - font-weight: inherit; - margin-bottom: 0; - } - .header { line-height: 30px; overflow: hidden; @@ -410,28 +413,24 @@ } } - ul { - list-style: none; - margin: 0; + .links { + position: relative; + z-index: 4; - li { - display: inline-block; - vertical-align: bottom; + ul { + list-style: none; margin: 0; - &:first-child a { - padding-left: 0; - } + li { + display: inline-block; + vertical-align: bottom; + margin: 0; - &:last-child a { - padding-right: 0; + &:last-child a { + padding-right: 0; + } } } - } - - .links { - position: relative; - z-index: 4; a { display: flex; @@ -480,13 +479,11 @@ padding: 0; } - .learn-more-cta { - background: darken($ui-base-color, 4%); - padding: 50px 0; - } - - .extended-description { + .learn-more-cta, .extended-description { padding: 50px 0; + font-weight: 400; + color: $lp-par-color; + font: 16px/1.6 'mastodon-font-sans-serif', sans-serif; ul, ol { @@ -509,16 +506,27 @@ p, li { - font: 16px/28px 'mastodon-font-sans-serif', sans-serif; - font-weight: 400; - margin-bottom: 12px; - color: $ui-base-lighter-color; + color: $lp-par-color; + margin-bottom: 6px; a { color: $ui-highlight-color; text-decoration: underline; } } + + li { + margin: 2px 0; + } + } + + .learn-more-cta { + background: darken($ui-base-color, 4%); + padding: 50px 0; + p { + font-size: 16px; + line-height: 28px; + } } h3 { @@ -532,8 +540,8 @@ p { font-size: 16px; - line-height: 30px; - color: $ui-base-lighter-color; + line-height: 28px; + color: $lp-par-color; } .features {