From b219450f3cd1a3413efb89df92935eaabb52ff53 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Sat, 15 Mar 2014 12:01:17 -0400 Subject: [PATCH] fixing lists on mobile posts and changing highlight color --- app/assets/stylesheets/common/components/badges.css.scss | 4 ++-- app/assets/stylesheets/common/foundation/base.scss | 5 +++++ app/assets/stylesheets/desktop/topic-list.scss | 2 +- app/assets/stylesheets/desktop/topic-post.scss | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index b752d83371a..30669a64092 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -10,7 +10,7 @@ %badge { display: inline-block; - font-weight: bold; + font-weight: normal; white-space: nowrap; @include border-radius-all(10px); } @@ -90,7 +90,7 @@ h1 a.badge-category div {vertical-align: top;} .badge-posts { color: $badge-posts-color; - font-weight: bold; + font-weight: normal; font-size: 14px; line-height: 1; &[href] { diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss index 6a02707718e..4d22e56cd25 100644 --- a/app/assets/stylesheets/common/foundation/base.scss +++ b/app/assets/stylesheets/common/foundation/base.scss @@ -53,6 +53,11 @@ dd { padding: 0; } + +.cooked ul, .cooked ol, .cooked dd { + clear: both; +} + li { > ul, > ol { diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 07a12934f78..9448ffadb95 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -83,7 +83,7 @@ } } &.highlighted { - background-color: $highlight_background_color; + background-color: $emphasis_background_color; } } th, diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 77bb5dc8f0e..df196fd30fe 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -762,7 +762,7 @@ blockquote { /* solo quotes */ position: relative; padding: 10px 0 15px 0; .highlighted { - background-color: $highlight_background_color !important; + background-color: $emphasis_background_color !important; } img, svg { max-width: 100%;