equal
deleted
inserted
replaced
10 object Layout extends config { |
10 object Layout extends config { |
11 |
11 |
12 lazy val bootstrapCss = s"/${http.prefix}/assets/bootstrap/${versions.bootstrap}/css/bootstrap.min.css" |
12 lazy val bootstrapCss = s"/${http.prefix}/assets/bootstrap/${versions.bootstrap}/css/bootstrap.min.css" |
13 lazy val bootstrapJs = s"/${http.prefix}/assets/bootstrap/${versions.bootstrap}/js/bootstrap.min.js" |
13 lazy val bootstrapJs = s"/${http.prefix}/assets/bootstrap/${versions.bootstrap}/js/bootstrap.min.js" |
14 lazy val fontAwesomeCss = s"/${http.prefix}/assets/font-awesome/${versions.fontAwesome}/css/all.min.css" |
14 lazy val fontAwesomeCss = s"/${http.prefix}/assets/font-awesome/${versions.fontAwesome}/css/all.min.css" |
15 lazy val siteCss = s"/${http.prefix}/public/css/site.css?${BuildInfo.hgId}" |
|
16 lazy val jquery = s"/${http.prefix}/assets/jquery/${versions.jquery}/jquery.min.js" |
15 lazy val jquery = s"/${http.prefix}/assets/jquery/${versions.jquery}/jquery.min.js" |
17 |
16 |
18 def apply(content: iContent, st: ViewState): TypedTag[String] = { |
17 def apply(content: iContent, st: ViewState): TypedTag[String] = { |
|
18 val siteCss = s"/${http.prefix}/public/${content.styleSheet._1}" |
19 html( |
19 html( |
20 head( |
20 head( |
21 tags2.style(""" |
21 tags2.style(""" |
22 |.nav, .pagination, .carousel, .panel-title a, .panel a { cursor: pointer; }""".stripMargin), |
22 |.nav, .pagination, .carousel, .panel-title a, .panel a { cursor: pointer; }""".stripMargin), |
23 meta(charset:="utf-8"), |
23 meta(charset:="utf-8"), |