Commit 892c47c4 authored by Paul Gascou-Vaillancourt's avatar Paul Gascou-Vaillancourt Committed by Miguel Rincon

Replace fa-rss with GitLab SVG icon

parent 8f5a80e9
...@@ -495,6 +495,10 @@ ...@@ -495,6 +495,10 @@
} }
} }
// The .btn-svg class is available for legacy icon buttons to
// preserve a 34px height and have 16x16 icons at the same time.
// Once a button is migrated (to the current 32px height)
// please remove this class from the new button.
.btn-svg svg { .btn-svg svg {
@include btn-svg; @include btn-svg;
} }
......
.nav-block.activities .nav-block.activities
= render 'shared/event_filter' = render 'shared/event_filter'
.controls .controls
= link_to dashboard_projects_path(rss_url_options), class: 'btn d-none d-sm-inline-block has-tooltip', title: 'Subscribe' do = link_to dashboard_projects_path(rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip', title: 'Subscribe' do
%i.fa.fa-rss = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16)
.content_list .content_list
.loading .loading
......
.nav-block.activities .nav-block.activities
= render 'shared/event_filter', show_group_events: @group.supports_events? = render 'shared/event_filter', show_group_events: @group.supports_events?
.controls .controls
= link_to group_path(@group, rss_url_options), class: 'btn d-none d-sm-inline-block has-tooltip' , title: 'Subscribe' do = link_to group_path(@group, rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' , title: 'Subscribe' do
%i.fa.fa-rss = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16)
.content_list .content_list
.loading .loading
......
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
= render layout: 'users/cover_controls' do = render layout: 'users/cover_controls' do
= link_to '#', class: link_classes + 'btn btn-default' do = link_to '#', class: link_classes + 'btn btn-default' do
= sprite_icon('pencil') = sprite_icon('pencil')
= link_to '#', class: link_classes + 'btn btn-default' do = link_to '#', class: link_classes + 'btn btn-svg btn-default' do
= icon('rss') = sprite_icon('rss', css_class: 'qa-rss-icon', size: 16)
.avatar-holder .avatar-holder
= image_tag avatar_icon_for_email('admin@example.com', 90), class: "avatar s90", alt: '' = image_tag avatar_icon_for_email('admin@example.com', 90), class: "avatar s90", alt: ''
.cover-title .cover-title
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
.nav-block.d-none.d-sm-flex.activities.gl-static .nav-block.d-none.d-sm-flex.activities.gl-static
= render 'shared/event_filter' = render 'shared/event_filter'
.controls.gl-display-flex .controls.gl-display-flex
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' do
= icon('rss') = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16)
- if is_project_overview && can?(current_user, :download_code, @project) - if is_project_overview && can?(current_user, :download_code, @project)
.project-clone-holder.d-none.d-md-inline-flex.gl-ml-2 .project-clone-holder.d-none.d-md-inline-flex.gl-ml-2
= render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right'
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
= form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) do = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) do
= search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control search-text-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control search-text-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false }
.control.d-none.d-md-block .control.d-none.d-md-block
= link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn btn-svg' do
= icon("rss") = sprite_icon('rss', css_class: 'qa-rss-icon', size: 16)
= render_if_exists 'projects/commits/mirror_status' = render_if_exists 'projects/commits/mirror_status'
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
- if can?(current_user, :admin_tag, @project) - if can?(current_user, :admin_tag, @project)
= link_to new_project_tag_path(@project), class: 'btn btn-success new-tag-btn', data: { qa_selector: "new_tag_button" } do = link_to new_project_tag_path(@project), class: 'btn btn-success new-tag-btn', data: { qa_selector: "new_tag_button" } do
= s_('TagsPage|New tag') = s_('TagsPage|New tag')
= link_to project_tags_path(@project, rss_url_options), title: _("Tags feed"), class: 'btn d-none d-sm-inline-block has-tooltip' do = link_to project_tags_path(@project, rss_url_options), title: _("Tags feed"), class: 'btn btn-svg d-none d-sm-inline-block has-tooltip' do
= icon("rss") = sprite_icon('rss', css_class: 'qa-rss-icon', size: 16)
= render_if_exists 'projects/commits/mirror_status' = render_if_exists 'projects/commits/mirror_status'
......
= link_to safe_params.merge(rss_url_options), class: 'btn has-tooltip js-rss-button', data: { container: 'body' }, title: _('Subscribe to RSS feed') do = link_to safe_params.merge(rss_url_options), class: 'btn btn-svg has-tooltip', data: { container: 'body' }, title: _('Subscribe to RSS feed') do
= sprite_icon('rss') = sprite_icon('rss', css_class: 'qa-rss-icon', size: 16)
= 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
= sprite_icon('calendar') = sprite_icon('calendar')
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
title: s_('UserProfile|Report abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do title: s_('UserProfile|Report abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= icon('exclamation-circle') = icon('exclamation-circle')
- if can?(current_user, :read_user_profile, @user) - if can?(current_user, :read_user_profile, @user)
= link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do = link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-svg btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do
= icon('rss') = sprite_icon('rss', css_class: 'qa-rss-icon', size: 16)
- if current_user && current_user.admin? - if current_user && current_user.admin?
= link_to [:admin, @user], class: link_classes + 'btn btn-default', title: s_('UserProfile|View user in admin area'), = link_to [:admin, @user], class: link_classes + 'btn btn-default', title: s_('UserProfile|View user in admin area'),
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
......
---
title: Replace fa-rss with GitLab SVG icon
merge_request: 36553
author:
type: other
...@@ -9,8 +9,7 @@ end ...@@ -9,8 +9,7 @@ end
RSpec.shared_examples "it has an RSS button with current_user's feed token" do RSpec.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) expect(page)
.to have_css("a:has(.fa-rss)[href*='feed_token=#{user.feed_token}']") .to have_css("a:has(.qa-rss-icon)[href*='feed_token=#{user.feed_token}']")
.or have_css("a.js-rss-button[href*='feed_token=#{user.feed_token}']")
end end
end end
...@@ -23,7 +22,6 @@ end ...@@ -23,7 +22,6 @@ end
RSpec.shared_examples "it has an RSS button without a feed token" do RSpec.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) expect(page)
.to have_css("a:has(.fa-rss):not([href*='feed_token'])") .to have_css("a:has(.qa-rss-icon):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