Skip to content

Commit d41cf0d

Browse files
committed
scalacss
1 parent 3b00e53 commit d41cf0d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

framework/src/main/scala/framework/Page.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package framework
22

33
import scalajs.js.annotation.JSExport
44
import scalatags.Text.all._
5+
import scalatags.Text.TypedTag
56
import scalacss.DevDefaults._
7+
import scalacss.ScalatagsCss._
68

79
abstract class Page(name: String) {
810
implicit val ec = scala.concurrent.ExecutionContext.global
@@ -21,8 +23,9 @@ abstract class Page(name: String) {
2123
)
2224
}
2325

24-
def cssLibs: List[Tag] = List(
26+
def cssLibs: List[Modifier] = List(
2527
JsLibs.bootstrap.css,
28+
styles.head.render[TypedTag[String]]
2629
)
2730

2831
def jsLibs: List[Tag] = List(
@@ -41,7 +44,6 @@ abstract class Page(name: String) {
4144
meta(charset := "utf-8"),
4245
meta(attr("name") := "viewport", content := kv("width" -> "device-width", "initial-scale" -> "1")), // required by Bootstrap
4346
cssLibs,
44-
//css(styles.map(_.render))
4547
)
4648

4749
def renderBody: Tag

web/src/main/scala/views/MortgageCalculator.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ object MortgageCalculator extends framework.Page("mortgage_calculator") {
6666
}
6767
}
6868

69-
7069
/*
71-
* Wed, Aug 30: ScalaCSS
72-
* Thu, Sep 1: code review + Screenshot + 2nd API
70+
* Thu, Sep 1: code review + 2nd API
7371
*/

0 commit comments

Comments
 (0)