diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-03 15:41:33 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-03 16:26:23 +0300 |
| commit | 0116930bb0ae30bcb7b43b87371f1418e74661f1 (patch) | |
| tree | fd6ff8d279767b67649109fc7c8e1fb0c2f6e6bc /app | |
| parent | 77c189a9a7687849eac438a2850c6a106b371399 (diff) | |
Uses npm css and removes css from vendor folder
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/terminal/terminal.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/jobs/terminal.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/terminal/terminal.js b/app/assets/javascripts/terminal/terminal.js index ead208bafec..8a94c9f4fe1 100644 --- a/app/assets/javascripts/terminal/terminal.js +++ b/app/assets/javascripts/terminal/terminal.js @@ -19,6 +19,7 @@ export default class GLTerminal { this.setSocketUrl(); this.createTerminal(); + $(window) .off('resize.terminal') .on('resize.terminal', () => { @@ -45,6 +46,7 @@ export default class GLTerminal { this.socket.binaryType = 'arraybuffer'; this.terminal.open(this.container); + this.terminal.fit(); this.socket.onopen = () => { this.runTerminal(); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 308eec12b62..ebc7e0e8106 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,7 +18,6 @@ */ @import "../../../node_modules/pikaday/scss/pikaday"; -@import "../../../node_modules/xterm/src/xterm.css"; /* diff --git a/app/views/projects/jobs/terminal.html.haml b/app/views/projects/jobs/terminal.html.haml index efea666a4d9..f7e7535ee92 100644 --- a/app/views/projects/jobs/terminal.html.haml +++ b/app/views/projects/jobs/terminal.html.haml @@ -5,7 +5,7 @@ - page_title 'Terminal', "#{@build.name} (##{@build.id})", 'Jobs' - content_for :page_specific_javascripts do - = stylesheet_link_tag "xterm/xterm" + = stylesheet_link_tag "xterm.css" .terminal-container{ class: container_class } #terminal{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } } |