From 9e74f232e0dbb72c12fb0d5f46f223e760608aae Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 22 May 2015 01:28:34 -0700 Subject: [PATCH] clean up topic summary / map CSS a bit --- .../stylesheets/desktop/topic-post.scss | 6 ++--- app/assets/stylesheets/mobile/topic-post.scss | 22 ++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 9e480771f18..4f96fe3c477 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -314,6 +314,7 @@ a.star { margin: 20px 0 0 0; background: dark-light-diff($primary, $secondary, 97%, -45%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); + border-top: none; // would cause double top border section { border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); @@ -324,6 +325,7 @@ a.star { color: scale-color($primary, $lightness: 20%); line-height: 23px; font-weight: normal; + font-size: 1em; } h4 { @@ -419,10 +421,8 @@ a.star { background: dark-light-diff($primary, $secondary, 97%, -45%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); &:hover { - background: dark-light-diff($primary, $secondary, 65%, -85%); color: $primary; - border: none !important; - span.badge-posts {color: $primary;} + background: dark-light-diff($primary, $secondary, 90%, -65%); } &.collapsed { diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 89dbd564dfb..59e085105bd 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -154,18 +154,21 @@ a.star { .topic-map { margin: 10px; - background: scale-color(scale-color-diff(), $lightness: 40%); + background: dark-light-diff($primary, $secondary, 97%, -45%); + border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); + border-top: none; // would cause double top border h3 { margin-bottom: 4px; - color: scale-color($primary, $lightness: 50%); + color: scale-color($primary, $lightness: 20%); line-height: 23px; font-weight: normal; + font-size: 1em; } h4 { margin: 0 0 3px 0; - color: $primary; + color: scale-color($primary, $lightness: 50%); font-weight: normal; font-size: 0.857em; line-height: 15px; @@ -199,14 +202,10 @@ a.star { } } - /* in expanded avatar view, limit to one line for now */ .avatars.clearfix { - height:40px; - overflow:hidden; margin-left: 10px; } - .avatar { float: left; margin-right: 4px; @@ -269,16 +268,13 @@ a.star { float: right; .btn { border: 0; - border-bottom: 1px solid scale-color-diff(); - border-left: 1px solid scale-color-diff(); padding: 0 15px; color: $primary; - background: scale-color-diff(); + background: dark-light-diff($primary, $secondary, 97%, -45%); + border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); &:hover { - background: scale-color($primary, $lightness: 75%); color: $primary; - border-bottom: 1px solid scale-color-diff(); - + background: dark-light-diff($primary, $secondary, 90%, -65%); } .fa { margin: 0;