From 162e8c50d368606dd26f870f2b4c88f0fa2cb780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 23 Feb 2017 17:05:42 +0100 Subject: [PATCH] Fixed CSS and LESS bundling for core vs plugins vs all --- src/octoprint/server/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index f1d48477..bf2f5ec9 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -1149,12 +1149,12 @@ class Server(object): if len(css_core) == 0: css_core_bundle = Bundle(*[]) else: - css_core_bundle = Bundle(*css_app, output="webassets/packed_core.css", filters="cssrewrite") + css_core_bundle = Bundle(*css_core, output="webassets/packed_core.css", filters="cssrewrite") if len(css_plugins) == 0: css_plugins_bundle = Bundle(*[]) else: - css_plugins_bundle = Bundle(*css_app, output="webassets/packed_plugins.css", filters="cssrewrite") + css_plugins_bundle = Bundle(*css_plugins, output="webassets/packed_plugins.css", filters="cssrewrite") if len(css_app) == 0: css_app_bundle = Bundle(*[]) @@ -1165,12 +1165,12 @@ class Server(object): if len(less_core) == 0: less_core_bundle = Bundle(*[]) else: - less_core_bundle = Bundle(*less_app, output="webassets/packed_core.less", filters="cssrewrite, less_importrewrite") + less_core_bundle = Bundle(*less_core, output="webassets/packed_core.less", filters="cssrewrite, less_importrewrite") if len(less_plugins) == 0: less_plugins_bundle = Bundle(*[]) else: - less_plugins_bundle = Bundle(*less_app, output="webassets/packed_plugins.less", filters="cssrewrite, less_importrewrite") + less_plugins_bundle = Bundle(*less_plugins, output="webassets/packed_plugins.less", filters="cssrewrite, less_importrewrite") if len(less_app) == 0: less_app_bundle = Bundle(*[])