From 70f9164e167398d75f99130a5325a3411215feb5 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 15 Nov 2014 15:59:38 -0800 Subject: works --- book/src/main/resources/css/side-menu.css | 18 +++++++--------- book/src/main/scala/book/Utils.scala | 36 +++++++++++++------------------ 2 files changed, 23 insertions(+), 31 deletions(-) (limited to 'book') diff --git a/book/src/main/resources/css/side-menu.css b/book/src/main/resources/css/side-menu.css index 00b351d..fbb2b26 100755 --- a/book/src/main/resources/css/side-menu.css +++ b/book/src/main/resources/css/side-menu.css @@ -32,13 +32,6 @@ Add transition to containers so they can push in and out. -o-transition: all 0.2s ease-out; transition: all 0.2s ease-out; } -.menu-item-list li > ul{ - -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; -} /* This is the parent `
` that contains the menu and the content area. @@ -319,14 +312,19 @@ code{ overflow: hidden; } - #menu .menu-item-list li.selected > a{ border-left: 2px solid white; } -#menu .menu-item-list li.lined > a{ - border-left: 2px solid white; + +.menu-item-list li > a{ + -webkit-transition: background-color 0.2s ease-out; + -moz-transition: background-color 0.2s ease-out; + -ms-transition: background-color 0.2s ease-out; + -o-transition: background-color 0.2s ease-out; + transition: background-color 0.2s ease-out; } +/*Override stuff from pure =/ it's not doing what I want*/ .pure-menu li > ul{ position:relative; visibility:visible; diff --git a/book/src/main/scala/book/Utils.scala b/book/src/main/scala/book/Utils.scala index ad41d18..6770e31 100644 --- a/book/src/main/scala/book/Utils.scala +++ b/book/src/main/scala/book/Utils.scala @@ -83,27 +83,21 @@ object lnk{ a(name, href:=url) } object dom{ - class MdnThing(name: String = toString) extends Frag{ - def render = lnk.apply(name, "https://developer.mozilla.org/en-US/docs/Web/API/" + name).render - def applyTo(t: Builder) = t.addChild(render) - } - class MdnEvent extends Frag { - def render = lnk.apply(toString, "https://developer.mozilla.org/en-US/docs/Web/Events/" + toString).render - def applyTo(t: Builder) = t.addChild(render) - } - object CanvasRenderingContext2D extends MdnThing() - object HTMLCanvasElement extends MdnThing() - object Element extends MdnThing() - object HTMLElement extends MdnThing() - object HTMLInputElement extends MdnThing() - object HTMLSpanElement extends MdnThing() - object XMLHttpRequest extends MdnThing() - object getElementById extends MdnThing("document.getElementById") - object setInterval extends MdnThing("WindowTimers.setInterval") - object mousedown extends MdnThing - object mouseup extends MdnThing - object onclick extends MdnThing - object onkeyup extends MdnThing + def mdnThing(name: String) = lnk(name, "https://developer.mozilla.org/en-US/docs/Web/API/" + name) + def mdnEvent(name: String) = lnk(name, "https://developer.mozilla.org/en-US/docs/Web/Events/" + name) + val CanvasRenderingContext2D = mdnThing("CanvasRenderingContext2D") + val HTMLCanvasElement = mdnThing("HTMLCanvasElement") + val Element = mdnThing("Element") + val HTMLElement = mdnThing("HTMLElement") + val HTMLInputElement = mdnThing("HTMLInputElement") + val HTMLSpanElement = mdnThing("HTMLSpanElement") + val XMLHttpRequest = mdnThing("XMLHttpRequest") + val getElementById = mdnThing("document.getElementById") + val setInterval = mdnThing("WindowTimers.setInterval") + val mousedown = mdnEvent("mousedown") + val mouseup = mdnEvent("mouseup") + val onclick = mdnEvent("onclick") + val onkeyup = mdnEvent("onkeyup") val JSONparse = lnk("Json.parse", "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse") } object scala{ -- cgit v1.2.3