github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 06:15:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2852 from awesomerobot/master

Browse Source 
restructuring post titles a bit
This commit is contained in:
Jeff Atwood 2014-10-06 09:57:00 -07:00
commit 948f4a59e9
6 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -9,12 +9,14 @@
{{#if postStream.firstPostPresent}} {{#if postStream.firstPostPresent}}
<div id='topic-title'> <div id='topic-title'>
<div class='container'> <div class='container'>
<div class='inner'>
{{#if showStarButton}} {{#if showStarButton}}
<a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a> <a {{bind-attr class=":star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
{{/if}} {{/if}}
<div class="title-wrapper">
{{#if editingTopic}} {{#if editingTopic}}
{{#if isPrivateMessage}} {{#if isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon envelope}}</span> <span class="private-message-glyph">{{fa-icon envelope}}</span>
@ -48,19 +50,18 @@
{{/if}} {{/if}}
</h1> </h1>
<div class="title-category-wrapper">
{{#unless isPrivateMessage}} {{#unless isPrivateMessage}}
{{#if category.parentCategory}} {{#if category.parentCategory}}
{{bound-category-link category.parentCategory}} {{bound-category-link category.parentCategory}}
{{/if}} {{/if}}
{{bound-category-link category}} {{bound-category-link category}}
{{/unless}} {{/unless}}
</div>
</div>
{{/if}} {{/if}}
{{plugin-outlet "topic-title"}} {{plugin-outlet "topic-title"}}
</div> </div>
</div>
</div> </div>
{{/if}} {{/if}}

18
app/assets/stylesheets/common/base/topic.scss Normal file
View File

@ -0,0 +1,18 @@
#topic-title {
.title-wrapper {float: left; width: 90%;}
a.badge-category {
margin-top: 5px;
}
h1 {
a.edit-topic {
font-size: 17px;
display: inline-block;
vertical-align: top;
position: relative;
}
}
}

17
app/assets/stylesheets/desktop/topic.scss
View File

@ -23,7 +23,6 @@
font-size: 20px; font-size: 20px;
margin-top: 6px; margin-top: 6px;
margin-right: 6px; margin-right: 6px;
margin-bottom: 30px; // this allows the categories to align underneath title
} }
#edit-title { width: 500px; } #edit-title { width: 500px; }
.category-combobox { .category-combobox {
@ -42,17 +41,11 @@
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary;} a {color: $primary;}
a.badge-category {
float: left;
vertical-align: top;
margin-top: 2px;
margin-right: 5px;
}
a.edit-topic { font-size: 17px; position: absolute; margin-left: 8px; }
}
.title-category-wrapper {
margin-top: 5px;
} }
.topic-statuses { .topic-statuses {
margin-top: -2px; margin-top: -2px;
} }
@ -62,6 +55,8 @@
margin-bottom: 2px; margin-bottom: 2px;
} }
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
} }
.private-message-glyph { .private-message-glyph {

1
app/assets/stylesheets/mobile/discourse.scss
View File

@ -27,6 +27,7 @@ body {
font-size: 20px; font-size: 20px;
color: scale-color($primary, $lightness: 75%); color: scale-color($primary, $lightness: 75%);
margin-right: 8px; margin-right: 8px;
margin-top: 4px;
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: "\f005"; content: "\f005";

1
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -132,7 +132,6 @@ a.star {
display: inline-block; display: inline-block;
float: left; float: left;
font-size: 1.3em; font-size: 1.3em;
margin-top: 4px;
} }
#main a.star.starred { #main a.star.starred {

4
app/assets/stylesheets/mobile/topic.scss
View File

@ -16,11 +16,9 @@
#topic-title { #topic-title {
margin-bottom: 20px; margin-bottom: 20px;
margin: 0 60px 10px 20px; margin: 0 60px 10px 20px;
.star {
margin-bottom: 30px; // this allows the categories to align underneath title
}
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
line-height: 1.25em;
margin:0; margin:0;
a { a {
color: $primary; color: $primary;