From f375731278825aa411cb04a4414da4ea9dcd51d6 Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 28 Feb 2018 15:02:11 -0500 Subject: [PATCH] About page layout improvements --- app/assets/stylesheets/common/base/about.scss | 17 +++------- app/assets/stylesheets/common/base/faqs.scss | 32 ++++++++----------- app/assets/stylesheets/mobile.scss | 1 - app/assets/stylesheets/mobile/faqs.scss | 9 ------ 4 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 app/assets/stylesheets/mobile/faqs.scss diff --git a/app/assets/stylesheets/common/base/about.scss b/app/assets/stylesheets/common/base/about.scss index 5debc067417..91bf2f1989a 100644 --- a/app/assets/stylesheets/common/base/about.scss +++ b/app/assets/stylesheets/common/base/about.scss @@ -1,27 +1,20 @@ section.about { + margin-bottom: 40px; h3 { - margin-bottom: 10px; - margin-top: 10px; - } - - - p { - margin: 10px 0; + margin-bottom: 15px; } table { - margin-top: 20px; - width: 90%; + width: auto; th { text-align: left; } td, th { - padding: 10px 5px 5px 5px; - border-bottom: 1px solid lighten($primary, 70%); - line-height: $line-height-small; + padding: 10px; + border-bottom: 1px solid $primary-low; } td.title { diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss index 1c1e437be9c..14ed949b61e 100644 --- a/app/assets/stylesheets/common/base/faqs.scss +++ b/app/assets/stylesheets/common/base/faqs.scss @@ -1,32 +1,26 @@ .body-page { - font-size: $font-up-1; - - // Consistent vertical spacing - blockquote, - h1, - h2, - h3, - hr, - p, - pre, - ul, - ol, - table { - margin: 0 0 20px; - line-height: $line-height-large; + /* intended only for /about /faq, /guidelines, /tos, and /privacy */ + width: 100%; + max-width: 700px; + padding-left: 20px; + font-size: $font-up-1; + .mobile-view & { + font-size: $font-0; + margin-top: 20px; } + li { margin-bottom: 8px; } + .nav-pills { + margin-bottom: 20px; + } + ul:not(.nav-pills), ol:not(.nav-pills) { margin-left: 40px; } - /* intended only for /faq, /guidelines, /tos, and /privacy */ - width: 700px; - padding-left:20px; - } diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 66c13c4f5c0..a95604a0cb9 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -7,7 +7,6 @@ @import "mobile/banner"; @import "mobile/compose"; @import "mobile/discourse"; -@import "mobile/faqs"; @import "mobile/header"; @import "mobile/login"; @import "mobile/modal"; diff --git a/app/assets/stylesheets/mobile/faqs.scss b/app/assets/stylesheets/mobile/faqs.scss deleted file mode 100644 index 4e34e9b2cf2..00000000000 --- a/app/assets/stylesheets/mobile/faqs.scss +++ /dev/null @@ -1,9 +0,0 @@ -// -------------------------------------------------- -// FAQs, About, etc -// -------------------------------------------------- - -.body-page { - margin-top: 20px; - width: 100%; - padding-left: 0; -} \ No newline at end of file