Commit 0116930b authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Uses npm css and removes css from vendor folder

parent 77c189a9
......@@ -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();
......
......@@ -18,7 +18,6 @@
*/
@import "../../../node_modules/pikaday/scss/pikaday";
@import "../../../node_modules/xterm/src/xterm.css";
/*
......
......@@ -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) } }
......@@ -133,7 +133,6 @@ class Application < Rails::Application
config.assets.precompile << "print.css"
config.assets.precompile << "notify.css"
config.assets.precompile << "mailers/*.css"
config.assets.precompile << "xterm/xterm.css"
config.assets.precompile << "page_bundles/ide.css"
config.assets.precompile << "performance_bar.css"
config.assets.precompile << "lib/ace.js"
......@@ -149,6 +148,10 @@ class Application < Rails::Application
config.assets.precompile << "icons.json"
config.assets.precompile << "illustrations/*.svg"
config.assets.paths<< "#{config.root}/node_modules/xterm/src/"
config.assets.precompile << "xterm.css"
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
......
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