diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-27 18:41:19 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-27 18:44:41 +0300 |
| commit | d7c0955b88f8947e2da41bbce76544dbda76cc0e (patch) | |
| tree | df4af2b201243e9fbc1269d533e40eac3c9b6406 /app/views/projects/merge_requests/_show.html.haml | |
| parent | b9ff4656a8afc7f401d032b857c2089612c597c2 (diff) | |
Fixed merge request tabs extra margin
Fixed extra margin when the merge request tabs are affixed
This was caused by some weird padding that was on the container & then
not correctly removed.
The fix involved removing the container from inside the tabs holder div
& then adding the widths through CSS depending on if fixed & whether the
parent is limited width or not.
In reality out container classes need to be fixed as it is getting pretty un-managable at the moment this should of been an easy fix, but in reality turned into something much harder.
Closes #26853
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index eade0c2a668..9585a9a3ad4 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -52,7 +52,7 @@ = render 'award_emoji/awards_block', awardable: @merge_request, inline: true .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') } - %div{ class: container_class } + .merge-request-tabs-container %ul.merge-request-tabs.nav-links.no-top.no-bottom %li.notes-tab = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#notes', action: 'notes', toggle: 'tab' } do @@ -115,4 +115,3 @@ }); var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}"; - |