codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 10:08:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'awesomerobot-master'

Browse source
This commit is contained in:
Robin Ward 2014-10-08 13:48:35 -04:00
commit d627b40234
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/header.hbs
View file

@ -95,9 +95,6 @@
{{#if showExtraInfo}} {{#if showExtraInfo}}
<div class="extra-info-wrapper"> <div class="extra-info-wrapper">
<div {{bind-attr class=":extra-info hasCategory"}}> <div {{bind-attr class=":extra-info hasCategory"}}>
{{#if showStarButton}}
<a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
{{/if}}
<div class="title-wrapper"> <div class="title-wrapper">
<h1> <h1>
{{#if showPrivateMessageGlyph}} {{#if showPrivateMessageGlyph}}
@ -105,13 +102,16 @@
{{/if}} {{/if}}
{{#if topic.details.loaded}} {{#if topic.details.loaded}}
{{#if showStarButton}}
<a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
{{/if}}
{{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>
{{else}} {{else}}
{{#if topic.errorLoading}} {{#if topic.errorLoading}}
{{topic.errorTitle}} <span class="error">{{topic.errorTitle}}</span>
{{else}} {{else}}
{{i18n topic.loading}} <span class="loading">{{i18n topic.loading}}</span>
{{/if}} {{/if}}
{{/if}} {{/if}}
</h1> </h1>

22
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -522,9 +522,24 @@ iframe {
max-width: 100%; max-width: 100%;
} }
@keyframes fadein {
from {opacity: 0;}
to {opacity: 1;}
}
@-webkit-keyframes fadein {
from {opacity: 0;}
to {opacity: 1;}
}
.extra-info-wrapper { .extra-info-wrapper {
overflow: hidden; overflow: hidden;
.star, .badge-wrapper, i, .topic-link:not(.loading) {
-webkit-animation: fadein .7s;
animation-duration: .7s;
animation-name: fadein;
}
.topic-statuses { .topic-statuses {
i { color: $header_primary; } i { color: $header_primary; }
i.fa-envelope { color: $danger; } i.fa-envelope { color: $danger; }
@ -549,8 +564,8 @@ iframe {
} }
a.star { a.star {
margin: 6px 7px 20px 0; margin: 0 7px 20px 2px;
font-size: 20px; font-size: 17px;
color: dark-light-diff($secondary, $primary, 80%, -20%) !important; color: dark-light-diff($secondary, $primary, 80%, -20%) !important;
} }
a.star.starred {color: $danger !important;} a.star.starred {color: $danger !important;}
@ -583,9 +598,6 @@ iframe {
line-height: 1.1em; line-height: 1.1em;
margin: 0 0 2px 0; margin: 0 0 2px 0;
} }
.star {
margin-top: 3px;
}
} }