github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-18 14:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Continued topic-list tweaks (#14977)

Browse Source 
* REFACTOR: Prep for topic-list refactor
This commit is contained in:
Jordan Vidrine 2021-11-16 14:44:04 -06:00 committed by GitHub
parent 1b752a5dec
commit aa31fbe29a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
View File

@ -1,19 +1,19 @@
{{#conditional-loading-spinner condition=loading}} {{#conditional-loading-spinner condition=loading}}
{{#load-more selector=".bookmark-list .bookmark-list-item" action=loadMore}} {{#load-more selector=".bookmark-list .bookmark-list-item" action=loadMore}}
<table class="topic-list bookmark-list"> <table class="topic-list bookmark-list">
<thead> <thead class="topic-list-header">
{{#unless site.mobileView}} {{#unless site.mobileView}}
<th>{{i18n "topic.title"}}</th> <th class="topic-list-data">{{i18n "topic.title"}}</th>
<th>&nbsp;</th> <th class="topic-list-data">&nbsp;</th>
<th class="post-metadata">{{i18n "post.bookmarks.updated"}}</th> <th class="post-metadata topic-list-data">{{i18n "post.bookmarks.updated"}}</th>
<th class="post-metadata">{{i18n "activity"}}</th> <th class="post-metadata topic-list-data">{{i18n "activity"}}</th>
<th>&nbsp;</th> <th>&nbsp;</th>
{{/unless}} {{/unless}}
</thead> </thead>
<tbody> <tbody class="topic-list-body">
{{#each content as |bookmark|}} {{#each content as |bookmark|}}
<tr class="topic-list-item bookmark-list-item"> <tr class="topic-list-item bookmark-list-item">
<td class="main-link" role="rowheader"> <td class="main-link topic-list-data" role="rowheader">
<span class="link-top-line"> <span class="link-top-line">
<div class="bookmark-metadata"> <div class="bookmark-metadata">
{{#if bookmark.reminder_at}} {{#if bookmark.reminder_at}}
@ -48,17 +48,17 @@
<p class="post-excerpt" {{on "click" this.screenExcerptForExternalLink}}>{{html-safe bookmark.excerpt}}</p> <p class="post-excerpt" {{on "click" this.screenExcerptForExternalLink}}>{{html-safe bookmark.excerpt}}</p>
</td> </td>
{{#unless site.mobileView}} {{#unless site.mobileView}}
<td> <td class="topic-list-data">
{{#if bookmark.post_user_avatar_template}} {{#if bookmark.post_user_avatar_template}}
<a href={{bookmark.postUser.path}} data-user-card={{bookmark.post_user_username}} class="avatar"> <a href={{bookmark.postUser.path}} data-user-card={{bookmark.post_user_username}} class="avatar">
{{avatar bookmark.postUser avatarTemplatePath="avatar_template" usernamePath="username" namePath="name" imageSize="small"}} {{avatar bookmark.postUser avatarTemplatePath="avatar_template" usernamePath="username" namePath="name" imageSize="small"}}
</a> </a>
{{/if}} {{/if}}
</td> </td>
<td class="post-metadata">{{format-date bookmark.updated_at format="tiny"}}</td> <td class="post-metadata topic-list-data">{{format-date bookmark.updated_at format="tiny"}}</td>
{{raw "list/activity-column" topic=bookmark class="num post-metadata" tagName="td"}} {{raw "list/activity-column" topic=bookmark class="num post-metadata" tagName="td"}}
{{/unless}} {{/unless}}
<td> <td class="topic-list-data">
{{bookmark-actions-dropdown {{bookmark-actions-dropdown
bookmark=bookmark bookmark=bookmark
removeBookmark=(action "removeBookmark") removeBookmark=(action "removeBookmark")

2
app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
View File

@ -6,7 +6,7 @@
</div> </div>
</div> </div>
{{else}} {{else}}
{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}} {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list .topic-list-item" action=(action "loadMore")}}
{{topic-dismiss-buttons {{topic-dismiss-buttons
position="top" position="top"
selectedTopics=selected selectedTopics=selected

6
app/assets/stylesheets/common/components/bookmark-list.scss
View File

@ -1,13 +1,13 @@
$mobile-breakpoint: 700px; $mobile-breakpoint: 700px;
.bookmark-list { .bookmark-list {
th.post-metadata { .topic-list-data.post-metadata {
text-align: center; text-align: center;
} }
} }
.bookmark-list-item { .bookmark-list-item {
td.post-metadata { .topic-list-data.post-metadata {
text-align: center; text-align: center;
} }
@media (max-width: $mobile-breakpoint) { @media (max-width: $mobile-breakpoint) {
@ -15,7 +15,7 @@ $mobile-breakpoint: 700px;
padding-right: 0.5em; padding-right: 0.5em;
} }
} }
.main-link { .main-link.topic-list-data {
.bookmark-status-with-link { .bookmark-status-with-link {
a.title { a.title {
padding: 0; padding: 0;