Rename legacy pagination CSS classes

Avoid potential collision with new pagination styles.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/1900/head
Alex Coles 10 years ago
parent 71c4ee2c0f
commit 038d32f543
  1. 10
      app/assets/stylesheets/fonts/_openproject_icon_font.sass
  2. 4
      app/assets/stylesheets/legacy/_01_tables.sass
  3. 4
      app/assets/stylesheets/legacy/_14_issue_table.sass
  4. 2
      app/assets/stylesheets/legacy/_19_misc.sass
  5. 2
      app/helpers/pagination_helper.rb
  6. 6
      spec/helpers/pagination_helper_spec.rb

@ -223,11 +223,11 @@
.icon-context:before
@include icon-context-rules
.pagination .previous_page:before,
.pagination .next_page:after
.legacy-pagination .previous_page:before,
.legacy-pagination .next_page:after
@include icon-common
@include icon-context-rules
.pagination .next_page:after
.legacy-pagination .next_page:after
padding: 0 0 0 4px
.icon-add:before
@ -258,11 +258,11 @@ dt > .icon-changeset:before,
.icon-copy:before
content: "\e008"
.pagination .previous_page:before,
.legacy-pagination .previous_page:before,
.icon-double-arrow-left:before
content: "\e009"
.pagination .next_page:after,
.legacy-pagination .next_page:after,
.icon-double-arrow-right:before
content: "\e00a"

@ -650,8 +650,8 @@ ul.properties
textarea#custom_field_possible_values
width: 99%
.pagination
.legacy-pagination
font-size: 90%
p.pagination
p.legacy-pagination
margin-top: 8px

@ -82,8 +82,8 @@ form#issue-list
float: left
margin-right: 10px
.pagination, .other-formats
.legacy-pagination, .other-formats
margin: 10px 0
.pagination a
.legacy-pagination a
padding: 1px 2px

@ -311,7 +311,7 @@ select#available_columns
list-style-type: disc
list-style-position: inside
.pagination
.legacy-pagination
.previous_page
width: 100%
height: 15px

@ -48,7 +48,7 @@ module PaginationHelper
end
merged_options[:container] ?
content_tag(:p, html, :class => "pagination") :
content_tag(:p, html, :class => "legacy-pagination") :
html
end

@ -57,11 +57,11 @@ describe PaginationHelper, :type => :helper do
let(:pagination) { helper.pagination_links_full(paginator) }
it "should be inside a 'pagination' p" do
expect(pagination).to have_selector("p.pagination")
expect(pagination).to have_selector("p.legacy-pagination")
end
it "should not be inside a 'pagination' p if not desired" do
expect(helper.pagination_links_full(paginator, :container => false)).not_to have_selector("p.pagination")
expect(helper.pagination_links_full(paginator, :container => false)).not_to have_selector("p.legacy-pagination")
end
it "should have a next_page reference" do
@ -146,7 +146,7 @@ describe PaginationHelper, :type => :helper do
let(:total_entries) { 0 }
it "should be empty" do
expect(pagination).to have_selector(".pagination", :text => /\A\z/)
expect(pagination).to have_selector(".legacy-pagination", :text => /\A\z/)
end
end
end

Loading…
Cancel
Save