diff --git a/IPython/frontend/html/notebook/static/js/fulleditwidget.js b/IPython/frontend/html/notebook/static/js/fulleditwidget.js index 35d4057..29aa428 100644 --- a/IPython/frontend/html/notebook/static/js/fulleditwidget.js +++ b/IPython/frontend/html/notebook/static/js/fulleditwidget.js @@ -27,7 +27,6 @@ var IPython = (function (IPython) { this.element.find('#close_fulledit').button().on('click', function (){ that.close(); }) - // this.element.find('#fulledit_widget').addClass('ui-widget ui-widget-content'); this.element.find('#fulledit_header').addClass('ui-widget ui-widget-header'); this.element.find('#fulledit_editor').addClass('ui-widget ui-widget-content'); this.ace_editor = ace.edit("fulledit_editor"); @@ -37,6 +36,10 @@ var IPython = (function (IPython) { this.ace_editor.getSession().setTabSize(4); this.ace_editor.getSession().setUseSoftTabs(true); this.ace_editor.setHighlightActiveLine(false); + // Ace sets its css dynamically, so we need to do this here. These + // values are chosen to match those of our CodeMirror editors. + $('.ace_editor').css({fontFamily: 'monospace', fontSize: '110%', + lineHeight: '1.231'}); }; diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index 69ca96c..9956b1b 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -135,6 +135,8 @@ <li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li> <li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li> <hr/> + <li><a href="https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts" target="_blank">Ace Keyboard Shortcuts</a></li> + <hr/> <li><a href="http://docs.python.org" target="_blank">Python</a></li> <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li> <li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>