Commit f5868c14 authored by Simon Knox's avatar Simon Knox Committed by Clement Ho

Resolve "Scrolling tabs are broken on profile, activity, and projects"

parent 69228d79
...@@ -186,6 +186,7 @@ ...@@ -186,6 +186,7 @@
overflow-y: hidden; overflow-y: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
display: flex; display: flex;
flex-wrap: nowrap;
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
......
...@@ -230,6 +230,8 @@ ...@@ -230,6 +230,8 @@
} }
.scrolling-tabs-container { .scrolling-tabs-container {
position: relative;
.merge-request-tabs-container & { .merge-request-tabs-container & {
overflow: hidden; overflow: hidden;
} }
......
...@@ -678,6 +678,7 @@ ...@@ -678,6 +678,7 @@
.merge-request-tabs { .merge-request-tabs {
display: flex; display: flex;
flex-wrap: nowrap;
margin-bottom: 0; margin-bottom: 0;
padding: 0; padding: 0;
} }
......
...@@ -354,12 +354,6 @@ ...@@ -354,12 +354,6 @@
min-width: 200px; min-width: 200px;
} }
.deploy-keys {
.scrolling-tabs-container {
position: relative;
}
}
.deploy-key { .deploy-key {
// Ensure that the fingerprint does not overflow on small screens // Ensure that the fingerprint does not overflow on small screens
.fingerprint { .fingerprint {
......
...@@ -32,26 +32,25 @@ ...@@ -32,26 +32,25 @@
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left= icon('angle-left') .fade-left= icon('angle-left')
.fade-right= icon('angle-right') .fade-right= icon('angle-right')
.nav-links.scrolling-tabs.nav.nav-tabs %ul.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
%ul.merge-request-tabs.nav-tabs.nav %li.notes-tab
%li.notes-tab = tab_link_for @merge_request, :show, force_link: @commit.present? do
= tab_link_for @merge_request, :show, force_link: @commit.present? do Discussion
Discussion %span.badge.badge-pill= @merge_request.related_notes.user.count
%span.badge.badge-pill= @merge_request.related_notes.user.count - if @merge_request.source_project
- if @merge_request.source_project %li.commits-tab
%li.commits-tab = tab_link_for @merge_request, :commits do
= tab_link_for @merge_request, :commits do Commits
Commits %span.badge.badge-pill= @commits_count
%span.badge.badge-pill= @commits_count - if @pipelines.any?
- if @pipelines.any? %li.pipelines-tab
%li.pipelines-tab = tab_link_for @merge_request, :pipelines do
= tab_link_for @merge_request, :pipelines do Pipelines
Pipelines %span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size
%span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size %li.diffs-tab
%li.diffs-tab = tab_link_for @merge_request, :diffs do
= tab_link_for @merge_request, :diffs do Changes
Changes %span.badge.badge-pill= @merge_request.diff_size
%span.badge.badge-pill= @merge_request.diff_size
- if has_vue_discussions_cookie? - if has_vue_discussions_cookie?
#js-vue-discussion-counter #js-vue-discussion-counter
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment