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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
dbc3556e
Commit
dbc3556e
authored
Aug 12, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
f0b07a34
22f3142b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
2 deletions
+28
-2
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+20
-0
changelogs/unreleased/65790-highlight.yml
changelogs/unreleased/65790-highlight.yml
+5
-0
lib/gitlab/ci/ansi2html.rb
lib/gitlab/ci/ansi2html.rb
+1
-1
spec/lib/gitlab/ci/ansi2html_spec.rb
spec/lib/gitlab/ci/ansi2html_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
dbc3556e
...
...
@@ -603,6 +603,7 @@ $blame-blue: #254e77;
* Builds
*/
$builds-trace-bg
:
#111
;
$job-log-highlight-height
:
18px
;
/*
* Commit Page
...
...
app/assets/stylesheets/pages/builds.scss
View file @
dbc3556e
...
...
@@ -124,6 +124,26 @@
float
:
left
;
padding-left
:
$gl-padding-8
;
}
.section-start
{
display
:
inline
;
}
.section-start
,
.section-header
{
&
:hover
{
cursor
:
pointer
;
&
:
:
after
{
content
:
''
;
background-color
:
rgba
(
$white-light
,
0
.2
);
left
:
0
;
right
:
0
;
position
:
absolute
;
height
:
$job-log-highlight-height
;
}
}
}
}
.build-header
{
...
...
changelogs/unreleased/65790-highlight.yml
0 → 100644
View file @
dbc3556e
---
title
:
Adds highlight to the collapsible section
merge_request
:
author
:
type
:
added
lib/gitlab/ci/ansi2html.rb
View file @
dbc3556e
...
...
@@ -218,7 +218,7 @@ module Gitlab
return
if
@sections
.
include?
(
section
)
@sections
<<
section
write_raw
%{<div class="js-section-start fa fa-caret-down pr-2 cursor-pointer" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
write_raw
%{<div class="js-section-start
section-start
fa fa-caret-down pr-2 cursor-pointer" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
@lineno_in_section
=
0
end
...
...
spec/lib/gitlab/ci/ansi2html_spec.rb
View file @
dbc3556e
...
...
@@ -209,7 +209,7 @@ describe Gitlab::Ci::Ansi2html do
let
(
:section_start
)
{
"section_start:
#{
section_start_time
.
to_i
}
:
#{
section_name
}
\r\033
[0K"
}
let
(
:section_end
)
{
"section_end:
#{
section_end_time
.
to_i
}
:
#{
section_name
}
\r\033
[0K"
}
let
(
:section_start_html
)
do
'<div class="js-section-start fa fa-caret-down pr-2 cursor-pointer"'
\
'<div class="js-section-start
section-start
fa fa-caret-down pr-2 cursor-pointer"'
\
" data-timestamp=
\"
#{
section_start_time
.
to_i
}
\"
data-section=
\"
#{
class_name
(
section_name
)
}
\"
"
\
' role="button"></div>'
end
...
...
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