Updated Branches: refs/heads/master d2cd6f668 -> 2f0612bb5
upgrade to less4j 1.1.2 to fix https://github.com/SomMeri/less4j/issues/160 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2f0612bb Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2f0612bb Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2f0612bb Branch: refs/heads/master Commit: 2f0612bb5c95a75f2d72f21f5880f33b757b15d9 Parents: d2cd6f6 Author: Massimo Lusetti <[email protected]> Authored: Mon Sep 2 12:42:35 2013 +0200 Committer: Massimo Lusetti <[email protected]> Committed: Mon Sep 2 12:42:35 2013 +0200 ---------------------------------------------------------------------- tapestry-webresources/build.gradle | 2 +- .../test/java/t5/webresources/services/AppModule.java | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2f0612bb/tapestry-webresources/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index 0d9813e..881794f 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -2,7 +2,7 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio dependencies { compile project(":tapestry-core") - compile "com.github.sommeri:less4j:1.1.1" + compile "com.github.sommeri:less4j:1.1.2" compile "com.google.javascript:closure-compiler:v20130722" compile "org.mozilla:rhino:1.7R4" http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2f0612bb/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java b/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java index 8d23031..dcb4bd7 100644 --- a/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java +++ b/tapestry-webresources/src/test/java/t5/webresources/services/AppModule.java @@ -12,6 +12,7 @@ import org.apache.tapestry5.services.compatibility.Compatibility; import org.apache.tapestry5.services.compatibility.Trait; import org.apache.tapestry5.services.javascript.JavaScriptStack; import org.apache.tapestry5.services.javascript.StackExtension; +import org.apache.tapestry5.services.javascript.StackExtensionType; import org.apache.tapestry5.webresources.modules.WebResourcesModule; @SubModule(WebResourcesModule.class) @@ -30,21 +31,14 @@ public class AppModule { configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery"); configuration.add(SymbolConstants.MINIFICATION_ENABLED, true); - - // Temporarily comment out due to problems with Less4J & Bootstrap 3 - // see https://github.com/SomMeri/less4j/issues/160 - - // configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:bootstrap"); + configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "context:bootstrap"); } @Contribute(JavaScriptStack.class) @Core public static void overrideBootstrapCSS(OrderedConfiguration<StackExtension> configuration) { - // Temporarily comment out due to problems with Less4J & Bootstrap 3 - // see https://github.com/SomMeri/less4j/issues/160 - - // configuration.override("bootstrap.css", - // new StackExtension(StackExtensionType.STYLESHEET, "context:bootstrap/less/bootstrap.less"), "before:tapestry.css"); + configuration.override("bootstrap.css", + new StackExtension(StackExtensionType.STYLESHEET, "context:bootstrap/less/bootstrap.less"), "before:tapestry.css"); } }
