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
3e2f2b80
Commit
3e2f2b80
authored
Aug 09, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds highlight to collapsible line
In the job log adds a highlight when hovering the collapsible line
parent
c85cbc08
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 @
3e2f2b80
...
@@ -603,6 +603,7 @@ $blame-blue: #254e77;
...
@@ -603,6 +603,7 @@ $blame-blue: #254e77;
* Builds
* Builds
*/
*/
$builds-trace-bg
:
#111
;
$builds-trace-bg
:
#111
;
$job-log-highlight-height
:
18px
;
/*
/*
* Commit Page
* Commit Page
...
...
app/assets/stylesheets/pages/builds.scss
View file @
3e2f2b80
...
@@ -124,6 +124,26 @@
...
@@ -124,6 +124,26 @@
float
:
left
;
float
:
left
;
padding-left
:
$gl-padding-8
;
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
{
.build-header
{
...
...
changelogs/unreleased/65790-highlight.yml
0 → 100644
View file @
3e2f2b80
---
title
:
Adds highlight to the collapsible section
merge_request
:
author
:
type
:
added
lib/gitlab/ci/ansi2html.rb
View file @
3e2f2b80
...
@@ -218,7 +218,7 @@ module Gitlab
...
@@ -218,7 +218,7 @@ module Gitlab
return
if
@sections
.
include?
(
section
)
return
if
@sections
.
include?
(
section
)
@sections
<<
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
@lineno_in_section
=
0
end
end
...
...
spec/lib/gitlab/ci/ansi2html_spec.rb
View file @
3e2f2b80
...
@@ -209,7 +209,7 @@ describe Gitlab::Ci::Ansi2html do
...
@@ -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_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_end
)
{
"section_end:
#{
section_end_time
.
to_i
}
:
#{
section_name
}
\r\033
[0K"
}
let
(
:section_start_html
)
do
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
)
}
\"
"
\
" data-timestamp=
\"
#{
section_start_time
.
to_i
}
\"
data-section=
\"
#{
class_name
(
section_name
)
}
\"
"
\
' role="button"></div>'
' role="button"></div>'
end
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