summaryrefslogtreecommitdiff
path: root/book
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-13 00:56:59 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-13 00:56:59 -0800
commit3beb1dd285d89dd4b746b1c4cd287a8748376556 (patch)
tree071d5c4fd22c83fa6889a891161b0387e1f49e06 /book
parent7f33cb682200a501e0a48ab2fbad688317d80754 (diff)
downloadhands-on-scala-js-3beb1dd285d89dd4b746b1c4cd287a8748376556.tar.gz
hands-on-scala-js-3beb1dd285d89dd4b746b1c4cd287a8748376556.tar.bz2
hands-on-scala-js-3beb1dd285d89dd4b746b1c4cd287a8748376556.zip
Commit after converting to React.js
Diffstat (limited to 'book')
-rwxr-xr-xbook/src/main/resources/css/side-menu.css10
-rw-r--r--book/src/main/scala/book/Book.scala3
-rw-r--r--book/src/main/scalatex/book/Index.scalatex56
3 files changed, 35 insertions, 34 deletions
diff --git a/book/src/main/resources/css/side-menu.css b/book/src/main/resources/css/side-menu.css
index 8a9e25e..e5d014c 100755
--- a/book/src/main/resources/css/side-menu.css
+++ b/book/src/main/resources/css/side-menu.css
@@ -34,11 +34,11 @@ Add transition to containers so they can push in and out.
}
.hide,
.menu-item-list > li{
- -webkit-transition: height 0.2s ease-out;
- -moz-transition: height 0.2s ease-out;
- -ms-transition: height 0.2s ease-out;
- -o-transition: height 0.2s ease-out;
- transition: height 0.2s ease-out;
+ -webkit-transition: all 0.2s ease-out;
+ -moz-transition: all 0.2s ease-out;
+ -ms-transition: all 0.2s ease-out;
+ -o-transition: all 0.2s ease-out;
+ transition: all 0.2s ease-out;
}
/*
diff --git a/book/src/main/scala/book/Book.scala b/book/src/main/scala/book/Book.scala
index ea57945..857bf37 100644
--- a/book/src/main/scala/book/Book.scala
+++ b/book/src/main/scala/book/Book.scala
@@ -24,8 +24,9 @@ object Book {
"META-INF/resources/webjars/font-awesome/4.2.0/fonts/fontawesome-webfont.svg",
"META-INF/resources/webjars/font-awesome/4.2.0/fonts/fontawesome-webfont.ttf",
"META-INF/resources/webjars/font-awesome/4.2.0/fonts/fontawesome-webfont.woff",
+ "META-INF/resources/webjars/react/0.11.1/react.min.js",
"css/side-menu.css",
- "example-fastopt.js",
+ "example-opt.js",
"webpage/weather.js",
"favicon.svg",
"favicon.png"
diff --git a/book/src/main/scalatex/book/Index.scalatex b/book/src/main/scalatex/book/Index.scalatex
index 59d474e..e9a8fc8 100644
--- a/book/src/main/scalatex/book/Index.scalatex
+++ b/book/src/main/scalatex/book/Index.scalatex
@@ -20,43 +20,43 @@
@sect("Intro to Scala.js")
@Intro()
-@sect("Hands On", "Writing your first Scala.js programs")
- @p
- This half of the book walks you through various facets of the Scala.js development experience. From making your first app, to testing and publishing modules, to writing an integrated client-server application.
+ @sect("Hands On", "Writing your first Scala.js programs")
+ @p
+ This half of the book walks you through various facets of the Scala.js development experience. From making your first app, to testing and publishing modules, to writing an integrated client-server application.
- @sect("Getting Started")
- @handson.GettingStarted()
+ @sect("Getting Started")
+ @handson.GettingStarted()
- @sect("Making a Canvas App")
- @handson.CanvasApp()
+ @sect("Making a Canvas App")
+ @handson.CanvasApp()
- @sect("Interactive Web Pages")
- @handson.WebPage()
+ @sect("Interactive Web Pages")
+ @handson.WebPage()
- @sect("The Command Line")
- @handson.CommandLine()
+ @sect("The Command Line")
+ @handson.CommandLine()
- @sect("Cross Publishing Libraries")
- @handson.PublishingModules()
+ @sect("Cross Publishing Libraries")
+ @handson.PublishingModules()
- @sect("Integrating Client-Server")
- @handson.ClientServer()
+ @sect("Integrating Client-Server")
+ @handson.ClientServer()
-@sect("In Depth", "Exploring Scala.js")
- @p
- This half of the book dives into a few aspects of Scala.js much more deeply that the hands-on introduction does. It's aimed at someone who has already used Scala.js, and wants to explore the edge-cases, how things work under-the-cover, or why it has been designed in such a way. It's not a formal specification; rather, it's aim is to be a useful reference to read instead of (or in preparation for) digging into the implementation code.
+ @sect("In Depth", "Exploring Scala.js")
+ @p
+ This half of the book dives into a few aspects of Scala.js much more deeply that the hands-on introduction does. It's aimed at someone who has already used Scala.js, and wants to explore the edge-cases, how things work under-the-cover, or why it has been designed in such a way. It's not a formal specification; rather, it's aim is to be a useful reference to read instead of (or in preparation for) digging into the implementation code.
- @sect("Javascript Interoperability")
- @indepth.JavascriptInterop()
+ @sect("Javascript Interoperability")
+ @indepth.JavascriptInterop()
- @sect("Deviations from Scala-JVM")
- @indepth.SemanticDifferences()
+ @sect("Deviations from Scala-JVM")
+ @indepth.SemanticDifferences()
- @sect("The Compilation Pipeline")
- @indepth.CompilationPipeline()
+ @sect("The Compilation Pipeline")
+ @indepth.CompilationPipeline()
- @sect("Scala.js' Design Space")
- @indepth.DesignSpace()
+ @sect("Scala.js' Design Space")
+ @indepth.DesignSpace()
- @sect("Java APIs")
- @indepth.JavaAPIs() \ No newline at end of file
+ @sect("Java APIs")
+ @indepth.JavaAPIs() \ No newline at end of file