From a03676ac62d134134fdd5c28310bf12fa810648a Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sat, 9 Feb 2013 01:20:57 -0800 Subject: [PATCH] simplify faq/tos/privacy HTML and CSS --- .../stylesheets/application/faqs.css.scss | 122 ++---------------- app/views/static/faq.html.erb | 9 +- 2 files changed, 13 insertions(+), 118 deletions(-) diff --git a/app/assets/stylesheets/application/faqs.css.scss b/app/assets/stylesheets/application/faqs.css.scss index 634bd2cf1..1edec5caa 100755 --- a/app/assets/stylesheets/application/faqs.css.scss +++ b/app/assets/stylesheets/application/faqs.css.scss @@ -11,66 +11,33 @@ .body-page { - color: #1d1f20; - font: 14px/20px $base-font-family; - background: $base-background-color; + font-family: Georgia, Times, "Times New Roman", serif; + font-size: 16px; + line-height: 22px; // Consistent vertical spacing - - address, blockquote, h1, h2, h3, - h4, - h5, - h6, - hgroup, hr, p, pre, ul, ol, - dl, - figure, - fieldset, table { margin: 0 0 20px; - } - - // Links - - a { - color: $link-color; - text-decoration: none; - cursor: pointer; - &:visited { - color: $link-color-visited; - } - &:hover { - color: $link-color-hover; - } - &:focus { - outline: 0; - } - &:active { - color: $link-color-active; - } - } - - // Typography - - h1 { - font-size: 14px; + font-size: 16px; + line-height: 22px; } // Lists - ul, - ol, - dd { + ol { margin-left: 40px; padding: 0; + font-size: 16px; + line-height: 22px; } li { @@ -80,12 +47,6 @@ } } - // Embedded content - - img { - vertical-align: middle; - } - } // Content wrapper @@ -138,71 +99,4 @@ } } -} - -// Excerpts & Questions -// -------------------------------------------------- - -.body-page { - - #excerpt, - #questions { - float: right; - width: 658px; - } - - // Excerpts - - #excerpt { - @extend .clearfix; - display: none; - } - - // Questions - - #questions { - > article { - @extend .clearfix; - } - h1 { - margin-top: 20px; - } - > article:first-child h1 { - margin-top: 0; - } - } - -} - -// Buttons -// -------------------------------------------------- - -.body-page { - - .btn { - float: right; - margin-left: 10px; - &:last-child { - margin-left: 0; - } - } - - .collapse { - height: auto; - } - - .read-more { - float: right; - } - - input - { - height: 28px; - border-radius: 4px; - border: 1px solid #DDD; - padding-left: 10px; - box-shadow: 0px 0px 2px 1px gold; - float: right; - margin-left: 10px; - } } \ No newline at end of file diff --git a/app/views/static/faq.html.erb b/app/views/static/faq.html.erb index 7c49b771c..379f8f253 100644 --- a/app/views/static/faq.html.erb +++ b/app/views/static/faq.html.erb @@ -1,7 +1,6 @@
- +

This is a Civilized Place for Public Discussion

@@ -9,7 +8,9 @@ Please treat this discussion forum with the same respect you would a public park. We’re a community resource: a place to share skills, knowledge and interests. Use these guidelines to help keep this a clean, well-lighted, civilized place for public discourse.

+

These guidelines are not intended as a comprehensive list of hard and fast rules, merely as aids for the human judgment of moderators and the overall community. +

@@ -110,7 +111,7 @@

- Discourse can help keep things orderly — for example, the Like functionality heart lets a user increase the popularity of a post without having to make an entire post that says "+1" or "Agreed," etc. Traditional workarounds, such as "bump" and blank postings are not used here. You can even reply-as-a-new-topic! + Discourse can help keep things orderly — for example, the Like functionality lets a user increase the popularity of a post without having to make an entire post that says "+1" or "Agreed," etc. Traditional workarounds, such as "bump" and blank postings are not used here. You can even reply as a new topic.

Also, don't sign your posts — every post has your profile information and links in the header. @@ -135,4 +136,4 @@

-
+ \ No newline at end of file