Browse Source

Update to latest notebook and use its css

Steven Silvester 9 years ago
parent
commit
fdc8ed4b98
3 changed files with 3 additions and 106 deletions
  1. 1 1
      package.json
  2. 2 47
      src/default-theme/index.css
  3. 0 58
      src/default-theme/notebook.css

+ 1 - 1
package.json

@@ -8,7 +8,7 @@
     "codemirror": "^5.10.0",
     "jquery": "^2.2.0",
     "jquery-ui": "^1.10.5",
-    "jupyter-js-notebook": "^0.7.1",
+    "jupyter-js-notebook": "^0.7.2",
     "jupyter-js-services": "^0.5.0",
     "jupyter-js-ui": "^0.0.3",
     "jupyter-js-utils": "^0.3.0",

+ 2 - 47
src/default-theme/index.css

@@ -2,6 +2,8 @@
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
+@import url('~jupyter-js-notebook/lib/index.css');
+@import url('~jupyter-js-notebook/lib/theme.css');
 @import url('~jupyter-js-ui/lib/index.css');
 @import url('~jupyter-js-ui/lib/theme.css');
 @import './commandpalette.css';
@@ -364,50 +366,3 @@ body {
 .p-Menu-item.p-type-submenu > .p-Menu-itemSubmenuIcon::before {
   content: '\f0da';
 }
-
-
-.CodeMirror.cm-s-default {
-  line-height: 1.21429em;
-  /* Changed from 1em to our global default */
-  font-size: 14px;
-  height: auto;
-  /* Changed to auto to autogrow */
-  background: none;
-  /* Changed from white to allow our bg to show through */
-}
-
-
-.CodeMirror-scroll {
-  /*  The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/
-  /*  We have found that if it is visible, vertical scrollbars appear with font size changes.*/
-  overflow-y: hidden;
-  overflow-x: auto;
-}
-
-
-.CodeMirror-lines {
-  /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
-  /* we have set a different line-height and want this to scale with that. */
-  padding: 0.4em;
-}
-
-
-.CodeMirror-linenumber {
-  padding: 0 8px 0 4px;
-}
-
-
-
-.CodeMirror-gutters {
-  border-bottom-left-radius: 2px;
-  border-top-left-radius: 2px;
-}
-
-
-.CodeMirror pre {
-  /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */
-  /* .CodeMirror-lines */
-  padding: 0;
-  border: 0;
-  border-radius: 0;
-}

+ 0 - 58
src/default-theme/notebook.css

@@ -1,58 +0,0 @@
-/*-----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|----------------------------------------------------------------------------*/
-
-/* Increased specificity in case phosphor css is loaded later. */
-.p-Widget.jp-NotebookContainer {
-  overflow: auto;
-}
-
-
-.p-Widget.jp-Notebook {  
-  min-width: 50px;
-  min-height: 50px;
-}
-
-
-.jp-InputArea > .jp-CodeMirror {
-  border: 1px solid #cfcfcf;
-  border-radius: 2px;
-  background: #f7f7f7;
-  line-height: 1.21429em;
-}
-
-
-.jp-MarkdownCell {
-  outline: 0;
-}
-
-
-.jp-OutputArea pre {
-  background: #ffffff;
-  border: none;
-}
-
-
-.jp-Cell.jp-mod-selected {
-  border-color: #66BB6A;
-  border-left-width: 1px;
-  padding-left: 10px;
-  background: linear-gradient(to right, #66BB6A -40px, #66BB6A 5px, transparent 5px, transparent 100%);
-}
-
-
-.jp-Cell {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 10px;
-  padding-right: 10px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: transparent;
-}
-
-
-.jp-MarkdownCell {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}