diff --git a/IPython/html/base/handlers.py b/IPython/html/base/handlers.py index 888584c..d9b36c3 100644 --- a/IPython/html/base/handlers.py +++ b/IPython/html/base/handlers.py @@ -119,11 +119,6 @@ class IPythonHandler(AuthenticatedHandler): else: return app_log - @property - def use_less(self): - """Use less instead of css in templates""" - return self.settings.get('use_less', False) - #--------------------------------------------------------------- # URLs #--------------------------------------------------------------- @@ -193,7 +188,6 @@ class IPythonHandler(AuthenticatedHandler): base_kernel_url=self.base_kernel_url, logged_in=self.logged_in, login_available=self.login_available, - use_less=self.use_less, static_url=self.static_url, ) diff --git a/IPython/html/fabfile.py b/IPython/html/fabfile.py index aca4792..c186f63 100644 --- a/IPython/html/fabfile.py +++ b/IPython/html/fabfile.py @@ -27,7 +27,6 @@ def _compile_less(source, target, minify=True, verbose=False): verbose = _to_bool(verbose) min_flag = '-x' if minify is True else '' ver_flag = '--verbose' if verbose is True else '' - lessc = os.path.join('components', 'less.js', 'bin', 'lessc') with lcd(static_dir): - local('{lessc} {min_flag} {ver_flag} {source} {target}'.format(**locals())) + local('lessc {min_flag} {ver_flag} {source} {target}'.format(**locals())) diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index dfb89d8..9e1641e 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -180,7 +180,6 @@ class NotebookWebApplication(web.Application): nbextensions_path = ipython_app.nbextensions_path, mathjax_url=ipython_app.mathjax_url, config=ipython_app.config, - use_less=ipython_app.use_less, jinja2_env=Environment(loader=FileSystemLoader(template_path)), ) @@ -395,18 +394,6 @@ class NotebookApp(BaseIPythonApplication): BROWSER environment variable to override it. """) - use_less = Bool(False, config=True, - help="""Wether to use Browser Side less-css parsing - instead of compiled css version in templates that allows - it. This is mainly convenient when working on the less - file to avoid a build step, or if user want to overwrite - some of the less variables without having to recompile - everything. - - You will need to install the less.js component in the static directory - either in the source tree or in your profile folder. - """) - webapp_settings = Dict(config=True, help="Supply overrides for the tornado.web.Application that the " "IPython notebook uses.") diff --git a/IPython/html/static/components b/IPython/html/static/components index 1977b85..0972b56 160000 --- a/IPython/html/static/components +++ b/IPython/html/static/components @@ -1 +1 @@ -Subproject commit 1977b852048ecb05f66d3b8980221080c5decc49 +Subproject commit 0972b5683e1300f378537aa8eb6350a55070cbb9 diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html index c4dff3a..5bef21d 100644 --- a/IPython/html/templates/page.html +++ b/IPython/html/templates/page.html @@ -13,13 +13,7 @@ {% block stylesheet %} - {% block lesscss %} - {% if use_less %} - - {% else %} - - {% endif %} - {% endblock %} + {% endblock %} @@ -82,9 +76,6 @@ {% block script %} - {% if use_less %} - - {% endif %} {% endblock %} diff --git a/IPython/html/tests/casperjs/test_cases/render_markdown.js b/IPython/html/tests/casperjs/test_cases/render_markdown.js index 0554df4..b65a076 100644 --- a/IPython/html/tests/casperjs/test_cases/render_markdown.js +++ b/IPython/html/tests/casperjs/test_cases/render_markdown.js @@ -10,7 +10,7 @@ casper.notebook_test(function () { cell.render(); return cell.get_rendered(); }); - this.test.assertEquals(output, '

Foo

', 'Markdown JS API works.'); + this.test.assertEquals(output, '

Foo

', 'Markdown JS API works.'); // Test menubar entries. output = this.evaluate(function () { @@ -21,7 +21,7 @@ casper.notebook_test(function () { $('#run_cell').mouseenter().click(); return cell.get_rendered(); }); - this.test.assertEquals(output, '

Foo

', 'Markdown menubar items work.'); + this.test.assertEquals(output, '

Foo

', 'Markdown menubar items work.'); // Test toolbar buttons. output = this.evaluate(function () { @@ -32,5 +32,5 @@ casper.notebook_test(function () { $('#run_b').click(); return cell.get_rendered(); }); - this.test.assertEquals(output, '

Foo

', 'Markdown toolbar items work.'); + this.test.assertEquals(output, '

Foo

', 'Markdown toolbar items work.'); });