Resolve "Scrolling tabs are broken on profile, activity, and projects"
This commit is contained in:
parent
69228d796c
commit
f5868c14c7
|
@ -186,6 +186,7 @@
|
|||
overflow-y: hidden;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
|
||||
&::-webkit-scrollbar {
|
||||
display: none;
|
||||
|
|
|
@ -230,6 +230,8 @@
|
|||
}
|
||||
|
||||
.scrolling-tabs-container {
|
||||
position: relative;
|
||||
|
||||
.merge-request-tabs-container & {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
|
|
@ -678,6 +678,7 @@
|
|||
|
||||
.merge-request-tabs {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
margin-bottom: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
|
|
@ -354,12 +354,6 @@
|
|||
min-width: 200px;
|
||||
}
|
||||
|
||||
.deploy-keys {
|
||||
.scrolling-tabs-container {
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.deploy-key {
|
||||
// Ensure that the fingerprint does not overflow on small screens
|
||||
.fingerprint {
|
||||
|
|
|
@ -32,26 +32,25 @@
|
|||
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
|
||||
.fade-left= icon('angle-left')
|
||||
.fade-right= icon('angle-right')
|
||||
.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
|
||||
Discussion
|
||||
%span.badge.badge-pill= @merge_request.related_notes.user.count
|
||||
- if @merge_request.source_project
|
||||
%li.commits-tab
|
||||
= tab_link_for @merge_request, :commits do
|
||||
Commits
|
||||
%span.badge.badge-pill= @commits_count
|
||||
- if @pipelines.any?
|
||||
%li.pipelines-tab
|
||||
= tab_link_for @merge_request, :pipelines do
|
||||
Pipelines
|
||||
%span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size
|
||||
%li.diffs-tab
|
||||
= tab_link_for @merge_request, :diffs do
|
||||
Changes
|
||||
%span.badge.badge-pill= @merge_request.diff_size
|
||||
%ul.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
|
||||
%li.notes-tab
|
||||
= tab_link_for @merge_request, :show, force_link: @commit.present? do
|
||||
Discussion
|
||||
%span.badge.badge-pill= @merge_request.related_notes.user.count
|
||||
- if @merge_request.source_project
|
||||
%li.commits-tab
|
||||
= tab_link_for @merge_request, :commits do
|
||||
Commits
|
||||
%span.badge.badge-pill= @commits_count
|
||||
- if @pipelines.any?
|
||||
%li.pipelines-tab
|
||||
= tab_link_for @merge_request, :pipelines do
|
||||
Pipelines
|
||||
%span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size
|
||||
%li.diffs-tab
|
||||
= tab_link_for @merge_request, :diffs do
|
||||
Changes
|
||||
%span.badge.badge-pill= @merge_request.diff_size
|
||||
|
||||
- if has_vue_discussions_cookie?
|
||||
#js-vue-discussion-counter
|
||||
|
|
Loading…
Reference in New Issue