IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix up some markup to making styling latest categories easier"

Browse Source 
This reverts commit 2589b59f39.
This commit is contained in:
Robin Ward 2017-08-11 17:08:58 -04:00
parent 2589b59f39
commit c2016e2bc6
3 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/latest-topic-list-item.js.es6
View File

@ -3,6 +3,4 @@ import { showEntrance } from "discourse/components/topic-list-item";
export default Ember.Component.extend({ export default Ember.Component.extend({
tagName: "tr", tagName: "tr",
click: showEntrance, click: showEntrance,
classBindings: ['topic.archived'],
attributeBindings: ['topic.id:data-topic-id']
}); });

60
app/assets/javascripts/discourse/templates/components/latest-topic-list-item.hbs
View File

@ -1,27 +1,33 @@
<td class="topic-poster"> <table>
{{#with topic.lastPoster as |lastPoster|}} <tbody>
{{#user-link user=lastPoster}} <tr data-topic-id={{topic.id}} class="{{if topic.archived 'archived'}}">
{{avatar lastPoster imageSize="large"}} <td class="topic-poster">
{{/user-link}} {{#with topic.lastPoster as |lastPoster|}}
{{/with}} {{#user-link user=lastPoster}}
</td> {{avatar lastPoster imageSize="large"}}
<td class="main-link"> {{/user-link}}
<tr> {{/with}}
{{raw "topic-status" topic=topic}} </td>
{{topic-link topic}} <td class="main-link">
{{#if topic.featured_link}} <tr>
{{topic-featured-link topic}} {{raw "topic-status" topic=topic}}
{{/if}} {{topic-link topic}}
{{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}} {{#if topic.featured_link}}
</tr> {{topic-featured-link topic}}
<tr> {{/if}}
{{category-link topic.category}} {{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
{{discourse-tags topic mode="list"}} </tr>
</tr> <tr>
</td> {{category-link topic.category}}
<td class="topic-stats"> {{discourse-tags topic mode="list"}}
{{raw "list/posts-count-column" topic=topic tagName="div"}} </tr>
<div class="topic-last-activity"> </td>
<a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a> <td class="topic-stats">
</div> {{raw "list/posts-count-column" topic=topic tagName="div"}}
</td> <div class="topic-last-activity">
<a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
</div>
</td>
</tr>
</tbody>
</table>

65
app/assets/stylesheets/desktop/category-list.scss
View File

@ -115,13 +115,24 @@
} }
} }
.topic-list-latest { .categories-and-latest {
th.latest {
line-height: 19px; .category-list,
} .topic-list-latest {
} width: 48%;
}
.category-list {
float: left;
}
.topic-list-latest {
float: right;
th.latest {
line-height: 19px;
}
}
.categories-and-latest, .topic-list-latest {
.main-link { .main-link {
width: 100%; width: 100%;
} }
@ -147,34 +158,24 @@
padding-left: 8px; padding-left: 8px;
} }
.posts { .topic-list {
width: 100%; .posts {
text-align: right; width: 100%;
margin-bottom: 10px; text-align: right;
} margin-bottom: 10px;
}
.num.posts a { .num.posts a {
padding: 0; padding: 0;
} }
.more-topics, .more-topics,
.no-topics { .no-topics {
border-bottom: none; border-bottom: none;
td { td {
padding-right: 0; padding-right: 0;
color: $primary; color: $primary;
}
} }
} }
} }
.categories-and-latest {
.category-list {
width: 48%;
float: left;
}
.topic-list-latest {
width: 48%;
float: right;
}
}