From 8917e9951e7d98a8bd176ff8959c06772f897670 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Tue, 14 Oct 2014 16:37:03 -0700
Subject: [PATCH] Move terminal CSS into LESS file

---
 IPython/html/static/notebook/less/terminal.less | 4 ++++
 IPython/html/static/style/style.min.css         | 3 +++
 IPython/html/static/terminal/css/override.css   | 7 -------
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 IPython/html/static/terminal/css/override.css

diff --git a/IPython/html/static/notebook/less/terminal.less b/IPython/html/static/notebook/less/terminal.less
index 6eb7fcbe6..f20cefa9e 100644
--- a/IPython/html/static/notebook/less/terminal.less
+++ b/IPython/html/static/notebook/less/terminal.less
@@ -11,3 +11,7 @@
   color: black;
   background: white;
 }
+
+#terminado-container {
+    margin: 8px;
+}
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index f6bc10994..bdddd754b 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -10495,4 +10495,7 @@ span#autosave_status {
   color: black;
   background: white;
 }
+#terminado-container {
+  margin: 8px;
+}
 /*# sourceMappingURL=../style/style.min.css.map */
\ No newline at end of file
diff --git a/IPython/html/static/terminal/css/override.css b/IPython/html/static/terminal/css/override.css
deleted file mode 100644
index 0e37952d9..000000000
--- a/IPython/html/static/terminal/css/override.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*This file contains any manual css for this page that needs to override the global styles.
-This is only required when different pages style the same element differently. This is just
-a hack to deal with our current css styles and no new styling should be added in this file.*/
-
-#terminado-container {
-    margin: 8px;
-}