Commit 3290e21f authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray 🤰🏼

Merge branch '48894-fix-rss-button-interaction' into 'master'

Fix RSS button interaction on Dashboard, Project and Group activities

Closes #48894

See merge request gitlab-org/gitlab-ce!20549
parents 9451c80a 26675ec9
......@@ -321,11 +321,18 @@
}
&.activities {
display: flex;
border-bottom: 1px solid $border-color;
overflow: hidden;
.nav-links {
border-bottom: 0;
}
@include media-breakpoint-down(xs) {
display: block;
overflow: visible;
}
}
}
......
.nav-block.activities
= render 'shared/event_filter'
.controls
= link_to dashboard_projects_path(rss_url_options), class: 'btn rss-btn has-tooltip', title: 'Subscribe' do
%i.fa.fa-rss
= render 'shared/event_filter'
.content_list
= spinner
.nav-block.activities
= render 'shared/event_filter'
.controls
= link_to group_path(@group, rss_url_options), class: 'btn rss-btn has-tooltip' , title: 'Subscribe' do
%i.fa.fa-rss
= render 'shared/event_filter'
.content_list
= spinner
%div{ class: container_class }
.nav-block.activity-filter-block.activities
= render 'shared/event_filter'
.controls
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn rss-btn has-tooltip' do
= icon('rss')
= render 'shared/event_filter'
.content_list.project-activity{ :"data-href" => activity_project_path(@project) }
= spinner
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller.flex-fill
.fade-left= icon('angle-left')
.fade-right= icon('angle-right')
%ul.nav-links.event-filter.scrolling-tabs.nav.nav-tabs
......
---
title: Fix RSS button interaction on Dashboard, Project and Group activities
merge_request: 20549
author:
type: fixed
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