Commit 1c631ba3 authored by Fatih Acet's avatar Fatih Acet

Merge branch '32380-update-issue-list-icons' into 'master'

Resolve "Update issue list icons"

Closes #32380

See merge request gitlab-org/gitlab!18226
parents 82135aa5 171ee26e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon), %button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon),
data: { toggle: 'modal', target: '.issues-import-modal' } } data: { toggle: 'modal', target: '.issues-import-modal' } }
- if type == :icon - if type == :icon
= sprite_icon('upload') = sprite_icon('import')
- else - else
= _('Import CSV') = _('Import CSV')
= link_to safe_params.merge(rss_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to RSS feed') do = link_to safe_params.merge(rss_url_options), class: 'btn has-tooltip js-rss-button', data: { container: 'body' }, title: _('Subscribe to RSS feed') do
= icon('rss') = sprite_icon('rss')
= link_to safe_params.merge(calendar_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do = link_to safe_params.merge(calendar_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do
= custom_icon('icon_calendar') = sprite_icon('calendar')
---
title: Use correct icons for issue actions
merge_request:
author:
type: other
- if (current_user && @project.feature_available?(:export_issues)) || show_promotions? - if (current_user && @project.feature_available?(:export_issues)) || show_promotions?
%button.csv_download_link.btn.has-tooltip{ title: _('Export as CSV'), %button.csv_download_link.btn.has-tooltip{ title: _('Export as CSV'),
data: { toggle: 'modal', target: '.issues-export-modal' } } data: { toggle: 'modal', target: '.issues-export-modal' } }
= sprite_icon('download') = sprite_icon('export')
...@@ -8,7 +8,9 @@ end ...@@ -8,7 +8,9 @@ end
shared_examples "it has an RSS button with current_user's feed token" do shared_examples "it has an RSS button with current_user's feed token" do
it "shows the RSS button with current_user's feed token" do it "shows the RSS button with current_user's feed token" do
expect(page).to have_css("a:has(.fa-rss)[href*='feed_token=#{user.feed_token}']") expect(page)
.to have_css("a:has(.fa-rss)[href*='feed_token=#{user.feed_token}']")
.or have_css("a.js-rss-button[href*='feed_token=#{user.feed_token}']")
end end
end end
...@@ -20,6 +22,8 @@ end ...@@ -20,6 +22,8 @@ end
shared_examples "it has an RSS button without a feed token" do shared_examples "it has an RSS button without a feed token" do
it "shows the RSS button without a feed token" do it "shows the RSS button without a feed token" do
expect(page).to have_css("a:has(.fa-rss):not([href*='feed_token'])") expect(page)
.to have_css("a:has(.fa-rss):not([href*='feed_token'])")
.or have_css("a.js-rss-button:not([href*='feed_token'])")
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment