updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming

This commit is contained in:
Marco Morales
2015-08-04 11:19:47 -04:00
committed by Andy Armstrong
parent 41173fefee
commit dd67f8aa72
6 changed files with 9 additions and 9 deletions

View File

@@ -205,7 +205,7 @@ describe "DiscussionUserProfileView", ->
)
{always: ->}
)
@view.$(".pagination a").first().click()
@view.$(".discussion-pagination a").first().click()
expect(@view.$(".current-page").text()).toEqual("42")
expect(@view.$(".last-page").text()).toEqual("99")
@@ -216,5 +216,5 @@ describe "DiscussionUserProfileView", ->
params.error()
{always: ->}
)
@view.$(".pagination a").first().click()
@view.$(".discussion-pagination a").first().click()
expect(DiscussionUtil.discussionAlert).toHaveBeenCalled()

View File

@@ -155,7 +155,7 @@ if Backbone?
"?discussion_page=#{number}"
params = DiscussionUtil.getPaginationParams(@page, numPages, pageUrl)
pagination = _.template($("#pagination-template").html())(params)
@$('section.pagination').html(pagination)
@$('section.discussion-pagination').html(pagination)
navigateToPage: (event) =>
event.preventDefault()

View File

@@ -18,7 +18,7 @@ if Backbone?
baseUri = URI(window.location).removeSearch("page")
pageUrlFunc = (page) -> baseUri.clone().addSearch("page", page)
paginationParams = DiscussionUtil.getPaginationParams(@page, @numPages, pageUrlFunc)
@$el.find(".pagination").html(_.template($("#pagination-template").html())(paginationParams))
@$el.find(".discussion-pagination").html(_.template($("#pagination-template").html())(paginationParams))
changePage: (event) ->
event.preventDefault()

View File

@@ -8,6 +8,6 @@
<% }); %>
</section>
<section class="pagination">
<section class="discussion-pagination">
</section>
</section>

View File

@@ -4,4 +4,4 @@
<article class="discussion-thread" id="thread_<%= thread.id %>"/>
<% }); %>
</section>
<section class="pagination"/>
<section class="discussion-pagination"/>

View File

@@ -753,10 +753,10 @@ body.discussion {
}
section.discussion {
margin-top: ($baseline*1.5);
clear: both;
padding-top: $baseline;
.threads {
margin-top: $baseline;
}
.discussion-thread {
@@ -936,7 +936,7 @@ body.discussion {
color: $white;
}
section.pagination {
section.discussion-pagination {
margin-top: ($baseline*1.5);
nav.discussion-paginator {