Commit 6f694f24 authored by Filipa Lacerda's avatar Filipa Lacerda

Uses npm css and removes css from vendor folder

parent 2c87a2c7
...@@ -19,6 +19,7 @@ export default class GLTerminal { ...@@ -19,6 +19,7 @@ export default class GLTerminal {
this.setSocketUrl(); this.setSocketUrl();
this.createTerminal(); this.createTerminal();
$(window) $(window)
.off('resize.terminal') .off('resize.terminal')
.on('resize.terminal', () => { .on('resize.terminal', () => {
...@@ -45,6 +46,7 @@ export default class GLTerminal { ...@@ -45,6 +46,7 @@ export default class GLTerminal {
this.socket.binaryType = 'arraybuffer'; this.socket.binaryType = 'arraybuffer';
this.terminal.open(this.container); this.terminal.open(this.container);
this.terminal.fit();
this.socket.onopen = () => { this.socket.onopen = () => {
this.runTerminal(); this.runTerminal();
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
@import "../../../node_modules/pikaday/scss/pikaday"; @import "../../../node_modules/pikaday/scss/pikaday";
@import "../../../node_modules/xterm/src/xterm.css";
/* /*
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- page_title 'Terminal', "#{@build.name} (##{@build.id})", 'Jobs' - page_title 'Terminal', "#{@build.name} (##{@build.id})", 'Jobs'
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= stylesheet_link_tag "xterm/xterm" = stylesheet_link_tag "xterm.css"
.terminal-container{ class: container_class } .terminal-container{ class: container_class }
#terminal{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } } #terminal{ data: { project_path: terminal_project_job_path(@project, @build, format: :ws) } }
...@@ -147,7 +147,6 @@ module Gitlab ...@@ -147,7 +147,6 @@ module Gitlab
config.assets.precompile << "print.css" config.assets.precompile << "print.css"
config.assets.precompile << "notify.css" config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css" config.assets.precompile << "mailers/*.css"
config.assets.precompile << "xterm/xterm.css"
config.assets.precompile << "page_bundles/ide.css" config.assets.precompile << "page_bundles/ide.css"
config.assets.precompile << "performance_bar.css" config.assets.precompile << "performance_bar.css"
config.assets.precompile << "lib/ace.js" config.assets.precompile << "lib/ace.js"
...@@ -163,6 +162,9 @@ module Gitlab ...@@ -163,6 +162,9 @@ module Gitlab
config.assets.precompile << "icons.json" config.assets.precompile << "icons.json"
config.assets.precompile << "illustrations/*.svg" config.assets.precompile << "illustrations/*.svg"
config.assets.paths<< "#{config.root}/node_modules/xterm/src/"
config.assets.precompile << "xterm.css"
## EE-specific assets config START ## EE-specific assets config START
%w[images javascripts stylesheets].each do |path| %w[images javascripts stylesheets].each do |path|
config.assets.paths << "#{config.root}/ee/app/assets/#{path}" config.assets.paths << "#{config.root}/ee/app/assets/#{path}"
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment