Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove CSS hack.

This commit is contained in:
Guo Xiang Tan 2016-09-22 17:39:20 +08:00
parent 73fdf443fd
commit 7acbd63d92
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
View File

@ -7,7 +7,8 @@
expandExcerpts=expandExcerpts expandExcerpts=expandExcerpts
bulkSelectEnabled=bulkSelectEnabled bulkSelectEnabled=bulkSelectEnabled
canBulkSelect=canBulkSelect canBulkSelect=canBulkSelect
selected=selected}} selected=selected
skipHeader=skipHeader}}
{{else}} {{else}}
{{#unless loadingMore}} {{#unless loadingMore}}
<div class='alert alert-info'> <div class='alert alert-info'>

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

@ -6,7 +6,8 @@
canBulkSelect=canBulkSelect canBulkSelect=canBulkSelect
bulkSelectEnabled=bulkSelectEnabled bulkSelectEnabled=bulkSelectEnabled
selected=selected selected=selected
postsAction="showTopicEntrance"}} postsAction="showTopicEntrance"
skipHeader=true}}
{{conditional-loading-spinner condition=model.loadingMore}} {{conditional-loading-spinner condition=model.loadingMore}}
{{/load-more}} {{/load-more}}

6
app/assets/stylesheets/desktop/user.scss
View File

@ -669,16 +669,10 @@
} }
} }
.user-right .group-notification-menu { .user-right .group-notification-menu {
float: right; float: right;
margin-bottom: 5px; margin-bottom: 5px;
} }
.user-right.messages .topic-list {
thead, th.views, td.views {
display: none;
}
}
.user-main .nav-stacked { .user-main .nav-stacked {
&.activity-list { &.activity-list {