diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-20 09:26:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-20 09:26:42 +0000 |
| commit | 8c2192943a5efc4d0a28c67b04bf9b979def66a1 (patch) | |
| tree | cb82c3d1b56d7e3aa95e1fd35e6c7c3c6a66357b /app | |
| parent | 8acbb7d0a76443a6d69ac3633af841da5ae84e51 (diff) | |
| parent | dbab04b94254aa121eb265748e19761adc2b0afb (diff) | |
| download | gitlab-ce-8c2192943a5efc4d0a28c67b04bf9b979def66a1.tar.gz | |
Merge branch '44768-lazy-load-xterm-css' into 'master'
Lazy load xterm css custom colors file
Closes #44768
See merge request gitlab-org/gitlab-ce!21804
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/page_bundles/xterm.scss (renamed from app/assets/stylesheets/pages/xterm.scss) | 2 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/xterm.scss b/app/assets/stylesheets/page_bundles/xterm.scss index 7d40c61da26..7f040ac9b96 100644 --- a/app/assets/stylesheets/pages/xterm.scss +++ b/app/assets/stylesheets/page_bundles/xterm.scss @@ -1,3 +1,5 @@ +@import 'framework/variables'; + .build-page { // color codes are based on http://en.wikipedia.org/wiki/File:Xterm_256color_chart.svg // see also: https://gist.github.com/jasonm23/2868981 diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index cf8d42976f8..5321bc46e73 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -3,6 +3,9 @@ - breadcrumb_title "##{@build.id}" - page_title "#{@build.name} (##{@build.id})", "Jobs" +- content_for :page_specific_javascripts do + = stylesheet_link_tag 'page_bundles/xterm' + %div{ class: container_class } .build-page.js-build-page #js-build-header-vue |