Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
28b8b92e
Commit
28b8b92e
authored
Mar 28, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed alignment on some pages
Fixed pipelines tabs not showing arrows
parent
6d14af2c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
11 deletions
+31
-11
app/assets/javascripts/layout_nav.js
app/assets/javascripts/layout_nav.js
+3
-2
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+2
-0
app/assets/javascripts/vue_pipelines_index/components/navigation_tabs.js
...scripts/vue_pipelines_index/components/navigation_tabs.js
+4
-0
app/assets/javascripts/vue_pipelines_index/pipelines.js
app/assets/javascripts/vue_pipelines_index/pipelines.js
+7
-1
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+13
-6
app/views/search/_category.html.haml
app/views/search/_category.html.haml
+1
-1
app/views/shared/milestones/_tabs.html.haml
app/views/shared/milestones/_tabs.html.haml
+1
-1
No files found.
app/assets/javascripts/layout_nav.js
View file @
28b8b92e
...
...
@@ -11,8 +11,9 @@
});
};
$
(
function
()
{
var
$scrollingTabs
=
$
(
'
.scrolling-tabs
'
);
$
(
document
).
on
(
'
init.scrolling-tabs
'
,
()
=>
{
const
$scrollingTabs
=
$
(
'
.scrolling-tabs
'
).
not
(
'
.is-initialized
'
);
$scrollingTabs
.
addClass
(
'
is-initialized
'
);
hideEndFade
(
$scrollingTabs
);
$
(
window
).
off
(
'
resize.nav
'
).
on
(
'
resize.nav
'
,
function
()
{
...
...
app/assets/javascripts/main.js
View file @
28b8b92e
...
...
@@ -370,4 +370,6 @@ $(function () {
new
Aside
();
gl
.
utils
.
initTimeagoTimeout
();
$
(
document
).
trigger
(
'
init.scrolling-tabs
'
);
});
app/assets/javascripts/vue_pipelines_index/components/navigation_tabs.js
View file @
28b8b92e
...
...
@@ -16,6 +16,10 @@ export default {
},
},
mounted
()
{
$
(
document
).
trigger
(
'
init.scrolling-tabs
'
);
},
template
:
`
<ul class="nav-links scrolling-tabs">
<li
...
...
app/assets/javascripts/vue_pipelines_index/pipelines.js
View file @
28b8b92e
...
...
@@ -182,8 +182,14 @@ export default {
<div :class="cssClass">
<div
class="top-area scrolling-tabs-container"
class="top-area scrolling-tabs-container
inner-page-scroll-tabs
"
v-if="!isLoading && !shouldRenderEmptyState">
<div class="fade-left">
<i class="fa fa-angle-left" aria-hidden="true"></i>
</div>
<div class="fade-right">
<i class="fa fa-angle-right" aria-hidden="true"></i>
</div>
<navigation-tabs
:scope="scope"
:count="state.count"
...
...
app/assets/stylesheets/framework/nav.scss
View file @
28b8b92e
...
...
@@ -480,12 +480,6 @@
.inner-page-scroll-tabs
{
position
:
relative
;
.fade-right
,
.fade-left
{
top
:
17px
;
bottom
:
0
;
}
.fade-right
{
@include
fade
(
left
,
$white-light
);
right
:
0
;
...
...
@@ -505,4 +499,17 @@
left
:
5px
;
}
}
.fade-right
,
.fade-left
{
top
:
16px
;
bottom
:
auto
;
}
&
.is-smaller
{
.fade-right
,
.fade-left
{
top
:
11px
;
}
}
}
app/views/search/_category.html.haml
View file @
28b8b92e
.scrolling-tabs-container.inner-page-scroll-tabs
.scrolling-tabs-container.inner-page-scroll-tabs
.is-smaller
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.search-filter.scrolling-tabs
...
...
app/views/shared/milestones/_tabs.html.haml
View file @
28b8b92e
.scrolling-tabs-container.inner-page-scroll-tabs
.scrolling-tabs-container.inner-page-scroll-tabs
.is-smaller
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
%ul
.nav-links.scrolling-tabs
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment