From 43467a8aaa0d46b9ced604a118cba7ab884c379d Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Sun, 5 Oct 2014 20:29:39 -0400 Subject: [PATCH] new docked title category style - needs additional work --- .../javascripts/discourse/templates/header.hbs | 13 +++++++------ app/assets/stylesheets/desktop/topic-post.scss | 15 +++++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 496371537d9..d8cf81f9cf9 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -98,14 +98,12 @@ {{#if showStarButton}} {{/if}} +

{{#if showPrivateMessageGlyph}} {{fa-icon envelope}} {{/if}} - {{#if topic.category.parentCategory}} - {{bound-category-link topic.category.parentCategory}} - {{/if}} - {{bound-category-link topic.category}} + {{#if topic.details.loaded}} {{topic-status topic=topic}} {{{topic.fancy_title}}} @@ -117,11 +115,14 @@ {{/if}} {{/if}}

+ {{#if topic.category.parentCategory}} + {{bound-category-link topic.category.parentCategory}} + {{/if}} + {{bound-category-link topic.category}} +
{{/if}} - - diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index f030afd1eba..8d14530ede3 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -551,7 +551,7 @@ iframe { a.star { margin-right: 7px; font-size: 20px; - margin-top: 6px; + margin-top: 10px; color: dark-light-diff($secondary, $primary, 80%, -20%) !important; } @@ -562,11 +562,18 @@ iframe { } .badge-category { + border-left: 5px solid; + border-color: #aaa; + font-weight: normal; + text-transform: lowercase; + padding: 0 0 0 5px; + margin: 0 5px 0 1px; vertical-align: top; - margin-top: 2px; + + } + + .title-wrapper { float: left; - margin-right: 5px; - display: none; } }