From 8167cefe36eef1fedf17a6ef469019c3cdeed037 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 26 Feb 2014 12:02:44 -0500 Subject: [PATCH] Add envelope glyph to private message topic titles --- .../discourse/templates/header.js.handlebars | 3 +++ .../discourse/templates/topic.js.handlebars | 1 + app/assets/stylesheets/desktop/topic.scss | 4 ++++ app/assets/stylesheets/mobile/topic.scss | 20 +++++++++---------- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars index e850f5fd803..cc809fb00cf 100644 --- a/app/assets/javascripts/discourse/templates/header.js.handlebars +++ b/app/assets/javascripts/discourse/templates/header.js.handlebars @@ -10,6 +10,9 @@ {{/if}}

+ {{#if topic.isPrivateMessage}} + + {{/if}} {{#if topic.category.parentCategory}} {{boundCategoryLink topic.category.parentCategory}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars index 912ef4cee19..92eb539185d 100644 --- a/app/assets/javascripts/discourse/templates/topic.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars @@ -19,6 +19,7 @@ {{else}}

+ {{#if category.parentCategory}} {{boundCategoryLink category.parentCategory}} {{/if}} diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index ea8bf8061d8..387ac73b7a5 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -64,8 +64,12 @@ .fa-thumb-tack { margin-top: -1px; } } .chzn-container { vertical-align: middle; } + .private-message-glyph { display: none; } } +.private-message-glyph { color: lighten($primary_text_color, 60%); } +.private_message #topic-title .private-message-glyph { display: inline; } + #topic-closing-info { border-top: 1px solid lighten($primary_border_color, 10%) ; padding-top: 10px; diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 48c00043414..151c5f95113 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -26,19 +26,19 @@ #topic-title { margin-bottom: 20px; -margin: 0 60px 10px 20px; -line-height: 1.7em; - -h1 { - font-size: 1.5em; - margin:0; - -a.edit-topic {font-size: 15px;} + margin: 0 60px 10px 20px; + line-height: 1.7em; + h1 { + font-size: 1.5em; + margin:0; + a.edit-topic {font-size: 15px;} + } + .private-message-glyph { display: none; } } - -} +.private-message-glyph { color: lighten($primary_text_color, 60%); } +.private_message #topic-title .private-message-glyph { display: inline; } #topic-closing-info { margin-left: 10px;