From 8c4d80a3ff6a312bc983d819f865783678d922b6 2015-01-06 11:27:46
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2015-01-06 11:27:46
Subject: [PATCH] Merge pull request #7346 from jdfreder/terminal-page

Use page backdrop color in terminal page
---

diff --git a/IPython/html/static/base/less/page.less b/IPython/html/static/base/less/page.less
index f5b1b1b..c5c912b 100644
--- a/IPython/html/static/base/less/page.less
+++ b/IPython/html/static/base/less/page.less
@@ -35,6 +35,7 @@ div#header {
         width: 100%;
         height: 0px;
         border-bottom: 1px solid @navbar-default-border;
+        margin-bottom: -1px;
     }
 
     @media print {
diff --git a/IPython/html/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less
index 915bcbd..a08d7e3 100644
--- a/IPython/html/static/notebook/less/menubar.less
+++ b/IPython/html/static/notebook/less/menubar.less
@@ -1,5 +1,6 @@
 #menubar {
   .border-box-sizing();
+  margin-top: 1px;
 
   .navbar {
     border-top: 1px;
diff --git a/IPython/html/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less
index c187108..21c2287 100644
--- a/IPython/html/static/notebook/less/notebook.less
+++ b/IPython/html/static/notebook/less/notebook.less
@@ -76,13 +76,6 @@ p {
     height: 200px;
 }
 
-.lower-header-bar {
-    width: 100%;
-    height: 0px;
-    border-bottom: 1px solid @navbar-default-border;
-    margin-bottom: -1px;
-}
-
 .notebook_app #header {
     .box-shadow(@global-shadow);
 }
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 5c2c6d0..f89775b 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -8285,6 +8285,7 @@ div#header .header-bar {
   width: 100%;
   height: 0px;
   border-bottom: 1px solid #e7e7e7;
+  margin-bottom: -1px;
 }
 @media print {
   div#header {
@@ -10104,12 +10105,6 @@ p {
 .end_space {
   height: 200px;
 }
-.lower-header-bar {
-  width: 100%;
-  height: 0px;
-  border-bottom: 1px solid #e7e7e7;
-  margin-bottom: -1px;
-}
 .notebook_app #header {
   -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
   box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
@@ -10272,6 +10267,7 @@ select[multiple].celltoolbar select {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
+  margin-top: 1px;
 }
 #menubar .navbar {
   border-top: 1px;
@@ -11011,7 +11007,15 @@ span.autosave_status {
   -ms-transform: rotate(45deg);
   -o-transform: rotate(45deg);
 }
-.terminal {
+.terminal-app {
+  background: #eeeeee;
+}
+.terminal-app #header {
+  background: #ffffff;
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+}
+.terminal-app .terminal {
   float: left;
   font-family: monospace;
   color: white;
@@ -11021,16 +11025,16 @@ span.autosave_status {
   -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.4);
   box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.4);
 }
-.terminal,
-.terminal dummy-screen {
+.terminal-app .terminal,
+.terminal-app .terminal dummy-screen {
   line-height: 1em;
   font-size: 14px;
 }
-.terminal-cursor {
+.terminal-app .terminal-cursor {
   color: black;
   background: white;
 }
-#terminado-container {
+.terminal-app #terminado-container {
   margin-top: 20px;
 }
 /*# sourceMappingURL=style.min.css.map */
\ No newline at end of file
diff --git a/IPython/html/static/terminal/less/terminal.less b/IPython/html/static/terminal/less/terminal.less
index e6b2a24..4605e26 100644
--- a/IPython/html/static/terminal/less/terminal.less
+++ b/IPython/html/static/terminal/less/terminal.less
@@ -1,23 +1,32 @@
-.terminal {
-  float: left;
-  font-family: monospace;
-  color: white;
-  background: black;
-  padding: @code_padding;
-  border-radius: @border-radius-base;
-  .box-shadow(@global-shadow-dark);
+.terminal-app {
+  background: @page-backdrop-color;
 
-  &, dummy-screen {
-    line-height: 1em;
-    font-size: @notebook_font_size;
+  #header {
+    background: @body-bg;
+    .box-shadow(@global-shadow);
   }
-}
 
-.terminal-cursor {
-  color: black;
-  background: white;
-}
+  .terminal {
+    float: left;
+    font-family: monospace;
+    color: white;
+    background: black;
+    padding: @code_padding;
+    border-radius: @border-radius-base;
+    .box-shadow(@global-shadow-dark);
+
+    &, dummy-screen {
+      line-height: 1em;
+      font-size: @notebook_font_size;
+    }
+  }
 
-#terminado-container {
-  margin-top: @page-header-padding;
+  .terminal-cursor {
+    color: black;
+    background: white;
+  }
+
+  #terminado-container {
+    margin-top: @page-header-padding;
+  }
 }
diff --git a/IPython/html/templates/terminal.html b/IPython/html/templates/terminal.html
index 2b77acb..c73976f 100644
--- a/IPython/html/templates/terminal.html
+++ b/IPython/html/templates/terminal.html
@@ -6,6 +6,7 @@
 
 data-base-url="{{base_url}}"
 data-ws-path="{{ws_path}}"
+class="terminal-app"
 
 {% endblock %}