github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 06:46:11 +08:00
Code Issues Actions 1 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({
tagName: "tr",
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">
{{#with topic.lastPoster as |lastPoster|}}
{{#user-link user=lastPoster}}
{{avatar lastPoster imageSize="large"}}
{{/user-link}}
{{/with}}
</td>
<td class="main-link">
<tr>
{{raw "topic-status" topic=topic}}
{{topic-link topic}}
{{#if topic.featured_link}}
{{topic-featured-link topic}}
{{/if}}
{{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
</tr>
<tr>
{{category-link topic.category}}
{{discourse-tags topic mode="list"}}
</tr>
</td>
<td class="topic-stats">
{{raw "list/posts-count-column" topic=topic tagName="div"}}
<div class="topic-last-activity">
<a href="{{topic.lastPostUrl}}" title="{{topic.bumpedAtTitle}}">{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
</div>
</td>
<table>
<tbody>
<tr data-topic-id={{topic.id}} class="{{if topic.archived 'archived'}}">
<td class="topic-poster">
{{#with topic.lastPoster as |lastPoster|}}
{{#user-link user=lastPoster}}
{{avatar lastPoster imageSize="large"}}
{{/user-link}}
{{/with}}
</td>
<td class="main-link">
<tr>
{{raw "topic-status" topic=topic}}
{{topic-link topic}}
{{#if topic.featured_link}}
{{topic-featured-link topic}}
{{/if}}
{{topic-post-badges newPosts=topic.totalUnread unseen=topic.unseen url=topic.lastUnreadUrl}}
</tr>
<tr>
{{category-link topic.category}}
{{discourse-tags topic mode="list"}}
</tr>
</td>
<td class="topic-stats">
{{raw "list/posts-count-column" topic=topic tagName="div"}}
<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 {
th.latest {
line-height: 19px;
}
}
.categories-and-latest {
.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 {
width: 100%;
}
@ -147,34 +158,24 @@
padding-left: 8px;
}
.posts {
width: 100%;
text-align: right;
margin-bottom: 10px;
}
.topic-list {
.posts {
width: 100%;
text-align: right;
margin-bottom: 10px;
}
.num.posts a {
padding: 0;
}
.num.posts a {
padding: 0;
}
.more-topics,
.no-topics {
border-bottom: none;
td {
padding-right: 0;
color: $primary;
.more-topics,
.no-topics {
border-bottom: none;
td {
padding-right: 0;
color: $primary;
}
}
}
}
.categories-and-latest {
.category-list {
width: 48%;
float: left;
}
.topic-list-latest {
width: 48%;
float: right;
}
}