summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-19 15:12:55 -0800
committerStan Hu <stanhu@gmail.com>2019-01-19 15:15:05 -0800
commit7ea53e380299460cb6d7e683eeff38845224bf44 (patch)
treeb3e46e49f68ac30b7610a58b8d4a4a6ab6019741 /app
parent49efb57914b7daac651e0b3fbeb850584be66ce7 (diff)
downloadgitlab-ce-7ea53e380299460cb6d7e683eeff38845224bf44.tar.gz
Fix excessive blank space in project activity view
7075c5a1 introduced a regression in GitLab 11.7 by adding a `d-sm-block`, which caused the RSS feed icon to wrap to another line. Switching to `d-sm-flex` appears to make this appear on the same line. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56225
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/_activity.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index 31f1cf560e2..12da62f4c64 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -1,5 +1,5 @@
%div{ class: container_class }
- .nav-block.d-none.d-sm-block.activities
+ .nav-block.d-none.d-sm-flex.activities
= render 'shared/event_filter'
.controls
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn d-none d-sm-inline-block has-tooltip' do