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

6 files changed, 16 insertions, 5 deletions

diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
index 9dbb04e5443..8bab8cf36b1 100644
--- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss
+++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss
@@ -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;
+    }
   }
 }
 
diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index a676eba2aee..9c246e19faa 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -1,8 +1,8 @@
 .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
diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml
index 577c63503a8..82a497289f3 100644
--- a/app/views/groups/_activities.html.haml
+++ b/app/views/groups/_activities.html.haml
@@ -1,8 +1,8 @@
 .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
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index 1f701f2aa1b..6bf21570d41 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -1,10 +1,9 @@
 %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
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index ecb5b1c6ebc..7afb7b3a93b 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -1,4 +1,4 @@
-.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
diff --git a/changelogs/unreleased/48894-fix-rss-button-interaction.yml b/changelogs/unreleased/48894-fix-rss-button-interaction.yml
new file mode 100644
index 00000000000..546a4233d7e
--- /dev/null
+++ b/changelogs/unreleased/48894-fix-rss-button-interaction.yml
@@ -0,0 +1,5 @@
+---
+title: Fix RSS button interaction on Dashboard, Project and Group activities
+merge_request: 20549
+author:
+type: fixed