github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-22 21:48:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor discussion list styles, fix loading indicator height in pane

Browse Source
This commit is contained in:
Toby Zerner 2015-05-29 18:31:17 +09:30
parent 1bb5ef2d72
commit 5314d2b512
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/js/forum/src/components/discussion-list.js
View File

@ -117,8 +117,8 @@ export default class DiscussionList extends Component {
} }
view() { view() {
return m('div', [ return m('div.discussion-list', [
m('ul.discussions-list', [ m('ul', [
this.discussions().map(discussion => { this.discussions().map(discussion => {
var startUser = discussion.startUser(); var startUser = discussion.startUser();
var isUnread = discussion.isUnread(); var isUnread = discussion.isUnread();

20
framework/core/less/forum/index.less
View File

@ -26,9 +26,6 @@
.index-toolbar-action { .index-toolbar-action {
float: right; float: right;
} }
.index-results .loading-indicator {
height: 46px;
}
@media @phone, @tablet { @media @phone, @tablet {
.offset-content { .offset-content {
@ -84,10 +81,11 @@
& .hero, & .index-nav, & .index-toolbar { & .hero, & .index-nav, & .index-toolbar {
display: none; display: none;
} }
& .discussions-list > li { & .discussion-list > ul > li {
margin: 0; margin: 0;
padding-left: 57px + 15px; padding-left: 57px + 15px;
padding-right: 65px + 15px; padding-right: 65px + 15px;
&.active { &.active {
background: @fl-body-control-bg; background: @fl-body-control-bg;
} }
@ -132,15 +130,21 @@
// ------------------------------------ // ------------------------------------
// Discussions List // Discussions List
.discussions-list { .discussion-list {
& .loading-indicator {
height: 46px;
}
& > ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
position: relative; position: relative;
} }
}
@media @phone { @media @phone {
.discussions-list > li { .discussion-list > ul > li {
padding-right: 45px; padding-right: 45px;
& .contextual-controls { & .contextual-controls {
@ -150,13 +154,11 @@
} }
@media @tablet, @desktop, @desktop-hd { @media @tablet, @desktop, @desktop-hd {
.discussions-list { .discussion-list > ul > li {
& > li {
margin-right: -25px; margin-right: -25px;
padding-right: 65px + 25px; padding-right: 65px + 25px;
} }
} }
}
.discussion-summary { .discussion-summary {
position: relative; position: relative;