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
Tatuya Kamada
gitlab-ce
Commits
b9168b07
Commit
b9168b07
authored
Mar 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Affix the build scroll controls
Closes #4709
parent
be1ae2d6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
5 deletions
+36
-5
app/assets/javascripts/ci_build.js.coffee
app/assets/javascripts/ci_build.js.coffee
+14
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+2
-0
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+19
-4
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-1
No files found.
app/assets/javascripts/ci_build.js.coffee
0 → 100644
View file @
b9168b07
class
@
CiBuild
constructor
:
->
@
initScrollButtonAffix
()
initScrollButtonAffix
:
->
buildScroll
=
$
(
'#js-build-scroll'
)
body
=
$
(
'body'
)
buildTrace
=
$
(
'#build-trace'
)
buildScroll
.
affix
(
offset
:
bottom
:
->
body
.
outerHeight
()
-
(
buildTrace
.
outerHeight
()
+
buildTrace
.
offset
().
top
)
)
app/assets/javascripts/dispatcher.js.coffee
View file @
b9168b07
...
@@ -103,6 +103,8 @@ class Dispatcher
...
@@ -103,6 +103,8 @@ class Dispatcher
new
ProjectFork
()
new
ProjectFork
()
when
'projects:artifacts:browse'
when
'projects:artifacts:browse'
new
BuildArtifacts
()
new
BuildArtifacts
()
when
'projects:builds:show'
new
CiBuild
()
switch
path
.
first
()
switch
path
.
first
()
when
'admin'
when
'admin'
...
...
app/assets/stylesheets/pages/builds.scss
View file @
b9168b07
...
@@ -27,10 +27,25 @@
...
@@ -27,10 +27,25 @@
}
}
.scroll-controls
{
.scroll-controls
{
position
:
fixed
;
&
.affix-top
{
bottom
:
10px
;
position
:
absolute
;
left
:
250px
;
top
:
10px
;
z-index
:
100
;
right
:
25px
;
}
&
.affix-bottom
{
position
:
absolute
;
right
:
25px
;
}
&
.affix
{
right
:
30px
;
bottom
:
15px
;
@media
(
min-width
:
$screen-md-min
)
{
right
:
26%
;
}
}
a
{
a
{
display
:
block
;
display
:
block
;
...
...
app/views/projects/builds/show.html.haml
View file @
b9168b07
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
.autoscroll-container
.autoscroll-container
%button
.btn.btn-success.btn-sm
#autoscroll-button
{
:type
=>
"button"
,
:data
=>
{
:state
=>
'disabled'
}}
enable autoscroll
%button
.btn.btn-success.btn-sm
#autoscroll-button
{
:type
=>
"button"
,
:data
=>
{
:state
=>
'disabled'
}}
enable autoscroll
.clearfix
.clearfix
.scroll-controls
#js-build-scroll
.scroll-controls
=
link_to
'#up-build-trace'
,
class:
'btn'
do
=
link_to
'#up-build-trace'
,
class:
'btn'
do
%i
.fa.fa-angle-up
%i
.fa.fa-angle-up
=
link_to
'#down-build-trace'
,
class:
'btn'
do
=
link_to
'#down-build-trace'
,
class:
'btn'
do
...
...
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