diff --git a/app/assets/stylesheets/fonts/_openproject_icon_font.sass b/app/assets/stylesheets/fonts/_openproject_icon_font.sass index 90b94a46fc..a3d0ecd5e8 100644 --- a/app/assets/stylesheets/fonts/_openproject_icon_font.sass +++ b/app/assets/stylesheets/fonts/_openproject_icon_font.sass @@ -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" diff --git a/app/assets/stylesheets/legacy/_01_tables.sass b/app/assets/stylesheets/legacy/_01_tables.sass index e40c298463..4d498106c9 100644 --- a/app/assets/stylesheets/legacy/_01_tables.sass +++ b/app/assets/stylesheets/legacy/_01_tables.sass @@ -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 diff --git a/app/assets/stylesheets/legacy/_14_issue_table.sass b/app/assets/stylesheets/legacy/_14_issue_table.sass index f13a4f18fe..a86184332a 100644 --- a/app/assets/stylesheets/legacy/_14_issue_table.sass +++ b/app/assets/stylesheets/legacy/_14_issue_table.sass @@ -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 diff --git a/app/assets/stylesheets/legacy/_19_misc.sass b/app/assets/stylesheets/legacy/_19_misc.sass index c35c3a18d7..3c06443d36 100644 --- a/app/assets/stylesheets/legacy/_19_misc.sass +++ b/app/assets/stylesheets/legacy/_19_misc.sass @@ -311,7 +311,7 @@ select#available_columns list-style-type: disc list-style-position: inside -.pagination +.legacy-pagination .previous_page width: 100% height: 15px diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index d1aea3ccb2..ccf553a3b9 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -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 diff --git a/spec/helpers/pagination_helper_spec.rb b/spec/helpers/pagination_helper_spec.rb index 7cbe1b2b0a..22130d0e3a 100644 --- a/spec/helpers/pagination_helper_spec.rb +++ b/spec/helpers/pagination_helper_spec.rb @@ -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