github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 10:35:52 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

new docked title category style - needs additional work

Browse Source
This commit is contained in:
Kris Aubuchon 2014-10-05 20:29:39 -04:00 committed by Robin Ward
parent ac069d22a9
commit 43467a8aaa
2 changed files with 18 additions and 10 deletions
app/assets
javascripts/discourse/templates
header.hbs
stylesheets/desktop
topic-post.scss

13
app/assets/javascripts/discourse/templates/header.hbs

@ -98,14 +98,12 @@
{{#if showStarButton}} {{#if showStarButton}}
<a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a> <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
{{/if}} {{/if}}
<div class="title-wrapper">
<h1> <h1>
{{#if showPrivateMessageGlyph}} {{#if showPrivateMessageGlyph}}
<span class="private-message-glyph">{{fa-icon envelope}}</span> <span class="private-message-glyph">{{fa-icon envelope}}</span>
{{/if}} {{/if}}
{{#if topic.category.parentCategory}}
{{bound-category-link topic.category.parentCategory}}
{{/if}}
{{bound-category-link topic.category}}
{{#if topic.details.loaded}} {{#if topic.details.loaded}}
{{topic-status topic=topic}} {{topic-status topic=topic}}
<a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a> <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
@ -117,11 +115,14 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</h1> </h1>
{{#if topic.category.parentCategory}}
{{bound-category-link topic.category.parentCategory}}
{{/if}}
{{bound-category-link topic.category}}
</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}
</div> </div>
</div> </div>

15
app/assets/stylesheets/desktop/topic-post.scss

@ -551,7 +551,7 @@ iframe {
a.star { a.star {
margin-right: 7px; margin-right: 7px;
font-size: 20px; font-size: 20px;
margin-top: 6px; margin-top: 10px;
color: dark-light-diff($secondary, $primary, 80%, -20%) !important; color: dark-light-diff($secondary, $primary, 80%, -20%) !important;
} }
@ -562,11 +562,18 @@ iframe {
} }
.badge-category { .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; vertical-align: top;
margin-top: 2px;
}
.title-wrapper {
float: left; float: left;
margin-right: 5px;
display: none;
} }
} }