diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 22:34:20 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 22:34:20 -0500 |
| commit | c281fc670a8d1507abf20e830a290a04135f7ea4 (patch) | |
| tree | cc881dc8d1140efd3ac81a0ebc55176c033ba7dd /app/views/projects/merge_requests | |
| parent | 55e4fff733f2eb9c53e6506fbf0421f32426bce2 (diff) | |
| download | gitlab-ce-c281fc670a8d1507abf20e830a290a04135f7ea4.tar.gz | |
Add .nav.nav-tabs to nav-links
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_submit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml index 9d95f1c7b7f..ebcd99f2a9b 100644 --- a/app/views/projects/merge_requests/creations/_new_submit.html.haml +++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml @@ -24,7 +24,7 @@ There are no commits yet. = custom_icon ('illustration_no_commits') - else - %ul.merge-request-tabs.nav-links.no-top.no-bottom + %ul.merge-request-tabs.nav.nav-tabs.nav-links.no-top.no-bottom %li.commits-tab.active = link_to url_for(safe_params), data: {target: 'div#commits', action: 'new', toggle: 'tab'} do Commits diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 2dc752e5ec7..aa3fb623e58 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -30,7 +30,7 @@ .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller .fade-left= icon('angle-left') .fade-right= icon('angle-right') - .nav-links.scrolling-tabs + .nav-links.scrolling-tabs.nav.nav-tabs %ul.merge-request-tabs.nav-tabs.nav %li.notes-tab = tab_link_for @merge_request, :show, force_link: @commit.present? do |