From 930e14e258852818fa2e332ad94ffdd4f2a568f1 Mon Sep 17 00:00:00 2001 From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Date: Fri, 15 Feb 2019 08:32:27 -1000 Subject: [PATCH] Add bottom margin to notebook table, fix python highlighting (#4055) --- src/sql/parts/notebook/models/cell.ts | 6 +++--- src/sql/parts/notebook/notebook.css | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sql/parts/notebook/models/cell.ts b/src/sql/parts/notebook/models/cell.ts index 84d7f2c485..f52f199073 100644 --- a/src/sql/parts/notebook/models/cell.ts +++ b/src/sql/parts/notebook/models/cell.ts @@ -484,15 +484,15 @@ export class CellModel implements ICellModel { // Otherwise, default to python as the language let languageInfo = this.languageInfo; if (languageInfo) { - if (languageInfo.codemirror_mode) { + if (languageInfo.name) { + this._language = languageInfo.name; + } else if (languageInfo.codemirror_mode) { let codeMirrorMode: nb.ICodeMirrorMode = (languageInfo.codemirror_mode); if (codeMirrorMode && codeMirrorMode.name) { this._language = codeMirrorMode.name; } } else if (languageInfo.mimetype) { this._language = languageInfo.mimetype; - } else if (languageInfo.name) { - this._language = languageInfo.name; } } diff --git a/src/sql/parts/notebook/notebook.css b/src/sql/parts/notebook/notebook.css index 1560142830..45364a574b 100644 --- a/src/sql/parts/notebook/notebook.css +++ b/src/sql/parts/notebook/notebook.css @@ -88,6 +88,7 @@ .notebookEditor .notebook-cellTable { margin-left: 20px; margin-top: 10px; + margin-bottom: 10px; } .notebookEditor .notebook-cellTable .ui-widget-content.slick-row {