fixing less processing

Evolveum · Dec 8, 2020 · 7ec00fc · 7ec00fc
1 parent 42503e6
commit 7ec00fc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointUrlLocatorFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointUrlLocatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2017 Evolveum and contributors
+ * Copyright (c) 2010-2020 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -8,8 +8,12 @@
 package com.evolveum.midpoint.web.util;
 
 import org.springframework.core.env.PropertyResolver;
+import org.springframework.web.servlet.resource.WebJarsResourceResolver;
+import ro.isdc.wro.extensions.locator.WebjarUriLocator;
+import ro.isdc.wro.extensions.locator.WebjarsUriLocator;
 import ro.isdc.wro.model.resource.locator.ClasspathUriLocator;
 import ro.isdc.wro.model.resource.locator.ServletContextUriLocator;
+import ro.isdc.wro.model.resource.locator.StandaloneServletContextUriLocator;
 import ro.isdc.wro.model.resource.locator.factory.SimpleUriLocatorFactory;
 
 /**
@@ -19,6 +23,7 @@ public class MidPointUrlLocatorFactory extends SimpleUriLocatorFactory {
 
     public MidPointUrlLocatorFactory(PropertyResolver propertyResolver) {
         addLocator(new ClasspathUriLocator());
+        addLocator(new WebjarsUriLocator());
         addLocator(new ServletContextUriLocator());
         addLocator(new PropertyUrlUriLocator(propertyResolver));
     }

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -4,10 +4,9 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-
-@import "classpath:/META-INF/resources/webjars/AdminLTE/2.4.18/build/less/AdminLTE.less";
-@import "classpath:/META-INF/resources/webjars/AdminLTE/2.4.18/build/less/skins/_all-skins.less";
-@import "classpath:/static/less/midpoint-theme-variables.less";
+@import "webjars:AdminLTE/2.4.18/build/less/AdminLTE.less";
+@import "webjars:AdminLTE/2.4.18/build/less/skins/_all-skins.less";
+@import "/less/midpoint-theme-variables.less";
 
 body.custom-hold-transition {
 	.content-wrapper,

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less b/gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
@@ -1,18 +1,24 @@
-@import (reference) "classpath:/META-INF/resources/webjars/AdminLTE/2.4.18/build/bootstrap-less/variables.less";
-@import (reference) "classpath:/META-INF/resources/webjars/AdminLTE/2.4.18/build/bootstrap-less/mixins.less";
-@import "classpath:/static/less/midpoint/midpoint-variables.less";
-
-@import "classpath:/static/less/midpoint/prism-container.less";
-@import "classpath:/static/less/midpoint/wizard.less";
-@import "classpath:/static/less/midpoint/tree.less";
-@import "classpath:/static/less/midpoint/page-login.less";
-@import "classpath:/static/less/midpoint/page-user-details.less";
-@import "classpath:/static/less/midpoint/page-dashboard.less";
-@import "classpath:/static/less/midpoint/page-debugs.less";
-@import "classpath:/static/less/midpoint/capabilities.less";
-@import "classpath:/static/less/midpoint/tree-theme-basic.less";
-@import "classpath:/static/less/midpoint/operation-result.less";
-@import "classpath:/static/less/midpoint/icon-style.less";
+/*
+ * Copyright (c) 2010-2020 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+@import (reference) "webjars:AdminLTE/2.4.18/build/bootstrap-less/variables.less";
+@import (reference) "webjars:AdminLTE/2.4.18/build/bootstrap-less/mixins.less";
+@import "/less/midpoint/midpoint-variables.less";
+
+@import "/less/midpoint/prism-container.less";
+@import "/less/midpoint/wizard.less";
+@import "/less/midpoint/tree.less";
+@import "/less/midpoint/page-login.less";
+@import "/less/midpoint/page-user-details.less";
+@import "/less/midpoint/page-dashboard.less";
+@import "/less/midpoint/page-debugs.less";
+@import "/less/midpoint/capabilities.less";
+@import "/less/midpoint/tree-theme-basic.less";
+@import "/less/midpoint/operation-result.less";
+@import "/less/midpoint/icon-style.less";
 
 /**
  *  Overall styles for correct footer behaviour