kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Fix RSS button interaction on Dashboard, Project and Group activities

Closes #48894

See merge request gitlab-org/gitlab-ce!20549
This commit is contained in:
Annabel Gray 2018-07-13 13:21:41 +00:00
commit 3290e21f14
6 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/framework/secondary_navigation_elements.scss
View file

@ -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;
}
}
}

2
app/views/dashboard/_activities.html.haml
View file

@ -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

2
app/views/groups/_activities.html.haml
View file

@ -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

3
app/views/projects/_activity.html.haml
View file

@ -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

2
app/views/shared/_event_filter.html.haml
View file

@ -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

5
changelogs/unreleased/48894-fix-rss-button-interaction.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix RSS button interaction on Dashboard, Project and Group activities
merge_request: 20549
author:
type: fixed