From 8067381782d78ee39b258ae04fd200f781a7c45c Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Wed, 9 Apr 2014 21:19:04 -0400 Subject: [PATCH 1/2] de-bluing some non-links --- app/assets/stylesheets/desktop/topic-post.scss | 8 +++++--- app/assets/stylesheets/desktop/topic.scss | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index df932ff4ef9..3e42865a363 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -295,6 +295,8 @@ a.star { color: $secondary_text_color; } + + .avatars { > div { float: left; @@ -326,11 +328,10 @@ a.star { } } a, .number { - font-weight: bold; line-height: 20px; } - .number { - color: $link-color; + .number, i { + color: $secondary_text_color; } .avatar + a { float: left; @@ -462,6 +463,7 @@ iframe { width: 78%; max-width: 800px; .topic-statuses {margin-right: 5px;} + .topic-link {color: $primary_text_color;} } diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 92dbc4d258b..f54472a2d10 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -56,6 +56,7 @@ margin: 0; line-height: 1.2em; overflow: hidden; + a {color: $primary_text_color;} a.badge-category { vertical-align: top; margin-top: 4px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } } From ec96ca4c60abed4a7917decc4cced0c65e6f2270 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Wed, 9 Apr 2014 23:27:05 -0400 Subject: [PATCH 2/2] modifying some styles for the new pin/unpin feature --- .../stylesheets/common/base/_topic-list.scss | 1 + app/assets/stylesheets/desktop/discourse.scss | 3 +-- app/assets/stylesheets/desktop/topic-list.scss | 5 ++++- app/assets/stylesheets/desktop/topic-post.scss | 17 +++++++++++++---- app/assets/stylesheets/desktop/topic.scss | 13 ++++--------- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index f2f01d73329..895cc2a8127 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -1,3 +1,4 @@ .fa-thumb-tack.unpinned { @include fa-icon-rotate(315deg, 1); + color: $secondary_text_color; } diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index fab812b59b8..78068ffe3aa 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -231,8 +231,7 @@ blockquote { margin: 0; i { font-size: 15px; - color: darken($tertiary_text_color, 60%); - } + } } } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index f4eb89f4cb8..fda84a69d74 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -60,6 +60,9 @@ border-spacing: 0; margin: 0 0 10px; border-top: 1px solid $primary-border-color; + .fa-thumb-tack {color: $primary_text_color;} + .fa-thumb-tack.unpinned {color: $secondary_text_color;} + a.title {color: $primary_text_color;} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} @@ -166,6 +169,7 @@ .topic-status { margin-right: 4px; padding: 0; + font-size: 15px; &:last-of-type { margin-right: 0; } @@ -459,7 +463,6 @@ margin: 20px 0 10px; } -.topic-statuses .topic-status i {font-size: 15px;} .empty-topic-list { padding: 10px; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 3e42865a363..2cb4eccbf7f 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -30,7 +30,9 @@ margin-left: 0; } -h1 .topic-statuses .topic-status i {margin-right: 5px;} +h1 .topic-statuses .topic-status i { + font-size: 20px; +} .logo-small { margin-right: 8px; @@ -462,7 +464,12 @@ iframe { float: left; width: 78%; max-width: 800px; - .topic-statuses {margin-right: 5px;} + .topic-statuses { + i { color: $primary_text_color; +} + .unpinned { color: $secondary_text_color;} + + } .topic-link {color: $primary_text_color;} } @@ -488,12 +495,14 @@ iframe { } a.star { - margin-right: 8px; + margin-right: 7px; font-size: 20px; margin-top: 6px; } - .topic-statuses {margin-top: -2px;} + .topic-statuses { + margin-top: -2px; + } .badge-category { vertical-align: top; diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index f54472a2d10..2eb8bedecb5 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -37,7 +37,7 @@ margin-bottom: 20px; .star { font-size: 20px; - margin-top: 8px; + margin-top: 6px; margin-right: 6px; } #edit-title { width: 500px; } @@ -62,7 +62,9 @@ } .topic-statuses { margin-top: -2px; - .fa-thumb-tack { margin-top: -1px; } + .fa-thumb-tack { padding-left: 3px; + } + } .chzn-container { vertical-align: middle; } .private-message-glyph { display: none; } @@ -181,13 +183,6 @@ a:hover.reply-new { } -.topic-statuses .topic-status { - padding: 0; - i { - font-size:20px; - } -} - #suggested-topics .topic-statuses .topic-status { padding: 0; i {