Refactor discussion list styles, fix loading indicator height in pane

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

View File

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

View File

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