Skip to content

Commit ad56c95

Browse files
committed
Iterate
1 parent 4382700 commit ad56c95

File tree

8 files changed

+222
-65
lines changed

8 files changed

+222
-65
lines changed

packages/voila/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
"@jupyter-widgets/output": "^6.0.1",
1313
"@jupyterlab/application": "^3.0.0",
1414
"@jupyterlab/apputils": "^3.0.0",
15+
"@jupyterlab/apputils-extension": "^3.5.0",
1516
"@jupyterlab/coreutils": "^5.0.0",
1617
"@jupyterlab/docregistry": "^3.0.0",
1718
"@jupyterlab/javascript-extension": "^3.5.0",
1819
"@jupyterlab/json-extension": "^3.0.0",
1920
"@jupyterlab/logconsole": "^3.0.0",
2021
"@jupyterlab/mainmenu": "^3.0.0",
21-
"@jupyterlab/markdownviewer-extension": "^3.0.0",
22+
"@jupyterlab/markdownviewer-extension": "^3.5.0",
2223
"@jupyterlab/mathjax2-extension": "^3.0.0",
2324
"@jupyterlab/nbformat": "^3.0.0",
2425
"@jupyterlab/notebook": "^3.0.0",
@@ -49,7 +50,7 @@
4950
"@jupyterlab/builder": "^3.0.0",
5051
"@types/node": "^18.8.3",
5152
"babel-loader": "^8.0.5",
52-
"css-loader": "~5.0.2",
53+
"css-loader": "^6.7.2",
5354
"file-loader": "^6.2.0",
5455
"fs-extra": "^9.1.0",
5556
"glob": "~7.1.6",
@@ -58,6 +59,7 @@
5859
"p-limit": "^2.2.2",
5960
"raw-loader": "^4.0.2",
6061
"rimraf": "^3.0.2",
62+
"sass-loader": "^13.2.0",
6163
"style-loader": "^2.0.0",
6264
"svg-url-loader": "^7.1.1",
6365
"typescript": "~4.1.3",

packages/voila/style.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/voila/style/index.css

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
@import url('~@fortawesome/fontawesome-free/css/all.min.css');
2-
@import url('~@fortawesome/fontawesome-free/css/v4-shims.min.css');
3-
@import url('~@lumino/widgets/style/index.css');
4-
@import url('~@jupyterlab/apputils/style/index.css');
1+
@import url('@fortawesome/fontawesome-free/css/all.min.css');
2+
@import url('@fortawesome/fontawesome-free/css/v4-shims.min.css');
3+
@import url('@lumino/widgets/style/index.css');
4+
@import url('@jupyterlab/ui-components/style/index.css');
5+
@import url('@jupyterlab/apputils/style/index.css');
6+
@import url('@jupyterlab/rendermime/style/index.css');
7+
@import url('@jupyterlab/docregistry/style/index.css');

packages/voila/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ module.exports = [
8484
}),
8585
merge(baseConfig, {
8686
entry: './' + path.relative(__dirname, styleEntryPoint),
87+
mode: 'production',
8788
output: {
8889
path: distRoot,
8990
filename: 'voila-style.js'

share/jupyter/voila/templates/base/voila_setup.macro.html.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{%- macro voila_setup_labextensions(base_url, labextensions) -%}
22
<script src="{{ page_config['fullStaticUrl'] | e }}/voila.js"></script>
3-
<script src="{{ page_config['fullStaticUrl'] | e }}/voila-style.js"></script>
43
{%- endmacro %}
54

65
{# For backward compatibility #}

share/jupyter/voila/templates/classic/index.html.j2

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<script src="{{ resources.jquery_url }}"></script>
1111
{%- endblock html_head_js_jquery -%}
1212

13+
{# this overrides the default behaviour of rendering static widgets #}
14+
{% block jupyter_widgets %}
15+
{% endblock jupyter_widgets %}
16+
1317
{% block notebook_execute %}
1418
{# Copy so we do not modify the page_config with updates. #}
1519
{% set page_config_full = page_config.copy() %}
@@ -30,24 +34,13 @@
3034
{%- endblock html_head_js -%}
3135

3236
{%- block html_head_css -%}
33-
{{ resources.include_css("static/materialcolors.css") }}
34-
{{ resources.include_css("static/labvariables.css") }}
35-
36-
{#
37-
This is a temporary solution, when Notebook 7 is out, the "classic"
38-
template should inherit from the "lab" template and get the lab CSS
39-
automatically
40-
#}
41-
{{ resources.include_css("../lab/static/index.css") }}
42-
{{ resources.include_css("../lab/static/theme-light.css") }}
43-
37+
{{ resources.include_js("static/voila-style.js") }}
4438
<style>
4539
/*Hide empty cells*/
4640
.jp-mod-noOutputs.jp-mod-noInput {
4741
display: none;
4842
}
4943
</style>
50-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/font-awesome.min.css" type="text/css" />
5144
{{ super() }}
5245
{%- endblock html_head_css -%}
5346

share/jupyter/voila/templates/reveal/index.html.j2

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@
3636

3737
{%- endblock html_head_js -%}
3838

39-
{%- block html_head_css -%}
40-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/all.min.css" type="text/css" />
41-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/v4-shims.min.css" type="text/css" />
42-
{{ resources.include_css("static/materialcolors.css") }}
43-
{{ resources.include_css("static/labvariables.css") }}
44-
{{ super() }}
45-
{%- endblock html_head_css -%}
46-
4739
{% block body_header %}
4840
{% if resources.theme == 'dark' %}
4941
<body class="jp-Notebook" data-base-url="{{resources.base_url}}voila/" data-jp-theme-light="false" data-jp-theme-name="JupyterLab Dark">

0 commit comments

Comments
 (0)