Commit 03bf9826 authored by Mathieu leclaire's avatar Mathieu leclaire

Updated scalatags to 0.5.2

parent 47dd3c6c
...@@ -33,11 +33,10 @@ object ScalaWUIBuild extends Build { ...@@ -33,11 +33,10 @@ object ScalaWUIBuild extends Build {
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.lihaoyi" %%% "autowire" % "0.2.5", "com.lihaoyi" %%% "autowire" % "0.2.5",
"com.lihaoyi" %%% "upickle" % "0.2.7", "com.lihaoyi" %%% "upickle" % "0.2.7",
"com.lihaoyi" %%% "scalatags" % "0.4.6", "com.lihaoyi" %%% "scalatags" % "0.5.2",
"com.lihaoyi" %%% "scalarx" % "0.2.8", "com.lihaoyi" %%% "scalarx" % "0.2.8",
"fr.iscpif" %%% "scaladget" % "0.5.0-SNAPSHOT", "fr.iscpif" %%% "scaladget" % "0.5.0-SNAPSHOT",
"org.scala-js" %%% "scalajs-dom" % "0.8.0", "org.scala-js" %%% "scalajs-dom" % "0.8.0"
"org.webjars.bower" % "d3" % "3.5.5"
) )
) )
).dependsOn(shared) enablePlugins (ScalaJSPlugin) ).dependsOn(shared) enablePlugins (ScalaJSPlugin)
...@@ -55,7 +54,7 @@ object ScalaWUIBuild extends Build { ...@@ -55,7 +54,7 @@ object ScalaWUIBuild extends Build {
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.lihaoyi" %% "autowire" % "0.2.5", "com.lihaoyi" %% "autowire" % "0.2.5",
"com.lihaoyi" %% "upickle" % "0.2.7", "com.lihaoyi" %% "upickle" % "0.2.7",
"com.lihaoyi" %% "scalatags" % "0.4.6", "com.lihaoyi" %% "scalatags" % "0.5.2",
"org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
"ch.qos.logback" % "logback-classic" % "1.0.12" % "runtime", "ch.qos.logback" % "logback-classic" % "1.0.12" % "runtime",
......
...@@ -29,7 +29,7 @@ class Servlet extends ScalatraServlet { ...@@ -29,7 +29,7 @@ class Servlet extends ScalatraServlet {
tags.html( tags.html(
tags.head( tags.head(
tags.meta(tags.httpEquiv := "Content-Type", tags.content := "text/html; charset=UTF-8"), tags.meta(tags.httpEquiv := "Content-Type", tags.content := "text/html; charset=UTF-8"),
tags.link(tags.rel := "stylesheet", tags.`type` := "text/css", href := "css/d3.css"), tags.link(tags.rel := "stylesheet", tags.`type` := "text/css", href := "css/style.css"),
tags.script(tags.`type` := "text/javascript", tags.src := "js/client-opt.js"), tags.script(tags.`type` := "text/javascript", tags.src := "js/client-opt.js"),
tags.script(tags.`type` := "text/javascript", tags.src := "js/d3.v3.min.js") tags.script(tags.`type` := "text/javascript", tags.src := "js/d3.v3.min.js")
), ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment