summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-27 00:29:03 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-27 00:29:03 -0800
commit08b64d368f0e7bea1298a8f6aed689b0d6804dec (patch)
tree818609df70c6f592ad370d4180704441732c7d2c
parentad01669dbf0d4c298d716b29eff1141c72bedbb3 (diff)
downloadhands-on-scala-js-08b64d368f0e7bea1298a8f6aed689b0d6804dec.tar.gz
hands-on-scala-js-08b64d368f0e7bea1298a8f6aed689b0d6804dec.tar.bz2
hands-on-scala-js-08b64d368f0e7bea1298a8f6aed689b0d6804dec.zip
tweak transition
-rwxr-xr-xbook/src/main/resources/css/side-menu.css10
-rw-r--r--book/src/main/scalatex/book/handson/ClientServer.scalatex9
2 files changed, 12 insertions, 7 deletions
diff --git a/book/src/main/resources/css/side-menu.css b/book/src/main/resources/css/side-menu.css
index 2a64f7f..f6b07e5 100755
--- a/book/src/main/resources/css/side-menu.css
+++ b/book/src/main/resources/css/side-menu.css
@@ -322,11 +322,11 @@ code{
}
.menu-item-list ul, .menu-item-list a{
- -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;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
overflow: hidden
}
diff --git a/book/src/main/scalatex/book/handson/ClientServer.scalatex b/book/src/main/scalatex/book/handson/ClientServer.scalatex
index c2a4aab..48d35f2 100644
--- a/book/src/main/scalatex/book/handson/ClientServer.scalatex
+++ b/book/src/main/scalatex/book/handson/ClientServer.scalatex
@@ -75,7 +75,7 @@
@p
Now, if we go to the browser at @code{localhost:8080}, we should see our web-page!
- @iframe(src:="https://hands-on-scala-js.herokuapp.com/", width:="100%", height:="300px", "frameBorder".attr:="0")
+ @iframe(src:="https://hands-on-scala-js.herokuapp.com/", width:="100%", height:="350px", "frameBorder".attr:="0")
@p
This is a real, live example running on a @lnk("Heroku server", "https://hands-on-scala-js.herokuapp.com/"). Feel free to poke around and explore the filesystem on the server, just to convince yourself that this actually works and is not just a mock up.
@@ -213,7 +213,12 @@
While @hl.scala{Ajax.post} returned a @hl.scala{Future[dom.XMLHttpRequest]} and left us to call @hl.scala{upickle.read} and deserialize the data ourselves, @hl.scala{Ajaxer[Api].list(...).call()} now returns a @hl.scala{Future[Seq[FileData]]}! Thus we don't need to worry about making a mistake in the deserialization logic when we write it by hand.
@p
- Other than that, nothing much has changed. If you've done this correctly, the web application will look and behave exactly as it did earlier! So why did we do this in the first place?
+ Other than that, nothing much has changed. If you've done this correctly, the web application will look and behave exactly as it did earlier!
+
+ @iframe(src:="https://hands-on-scala-js.herokuapp.com/", width:="100%", height:="350px", "frameBorder".attr:="0")
+
+ @p
+ So why did we do this in the first place?
@sect{Why Autowire?}
@p