diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-19 12:56:41 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-19 12:56:41 +0000 |
| commit | 22755a4aa2d2884629ef9050227ef461574d9d94 (patch) | |
| tree | 759375ac63b02604a9f17b37038e0ba099252482 | |
| parent | 7277c9b0681186aea3e67ef7ec2dc2b597b5a98c (diff) | |
| parent | d3a1468b625c939d20862379a17fbc7d57c3e8aa (diff) | |
| download | gitlab-ce-22755a4aa2d2884629ef9050227ef461574d9d94.tar.gz | |
Merge branch '63417-add-missing-class' into 'master'
Adds missing class in collapsible sections
Closes #63417
See merge request gitlab-org/gitlab-ce!29804
| -rw-r--r-- | changelogs/unreleased/63417-add-missing-class.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/ansi2html.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/ansi2html_spec.rb | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/63417-add-missing-class.yml b/changelogs/unreleased/63417-add-missing-class.yml new file mode 100644 index 00000000000..3030f5c57e4 --- /dev/null +++ b/changelogs/unreleased/63417-add-missing-class.yml @@ -0,0 +1,5 @@ +--- +title: Indent collapsible sections +merge_request: 29804 +author: +type: other diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb index 6109b45ffd2..fc3223e7442 100644 --- a/lib/gitlab/ci/ansi2html.rb +++ b/lib/gitlab/ci/ansi2html.rb @@ -310,7 +310,7 @@ module Gitlab if @sections.any? css_classes << "section" - css_classes << "js-section-header" if @lineno_in_section == 0 + css_classes << "js-section-header section-header" if @lineno_in_section == 0 css_classes += sections.map { |section| "js-s-#{section}" } end diff --git a/spec/lib/gitlab/ci/ansi2html_spec.rb b/spec/lib/gitlab/ci/ansi2html_spec.rb index ac4612dda92..3d57ce431ab 100644 --- a/spec/lib/gitlab/ci/ansi2html_spec.rb +++ b/spec/lib/gitlab/ci/ansi2html_spec.rb @@ -231,8 +231,8 @@ describe Gitlab::Ci::Ansi2html do it 'prints light red' do text = "#{section_start}\e[91mHello\e[0m\n#{section_end}" - header = %{<span class="term-fg-l-red section js-section-header js-s-#{class_name(section_name)}">Hello</span>} - line_break = %{<span class="section js-section-header js-s-#{class_name(section_name)}"><br/></span>} + header = %{<span class="term-fg-l-red section js-section-header section-header js-s-#{class_name(section_name)}">Hello</span>} + line_break = %{<span class="section js-section-header section-header js-s-#{class_name(section_name)}"><br/></span>} line = %{<span class="section line s_#{class_name(section_name)}"></span>} empty_line = %{<span class="section js-s-#{class_name(section_name)}"></span>} html = "#{section_start_html}#{header}#{line_break}#{line}#{empty_line}#{section_end_html}" |