Add touch-ups after frame redesign

doclet/resources/main.css

@@ -1,5 +1,3 @@
-/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
-
 body {
 	font-family: "Fira Sans", "Source Sans Pro", "Helvetica Neue", sans-serif;
 	background-color: #293134;
@@ -26,17 +24,11 @@ a:hover {
 	transition-property: opacity;
 	transition-duration: 200ms;
 	transition-timing-function: cubic-bezier(.53,.4,.46,.75);
-	width: 240px;
-	height: 100%;
-	top: 0px;
-	left: 0px;
-	overflow: auto;
-	padding: 0px 0px 0px 10px;
 	opacity: 0.6;
 }
 
 .sidebar:hover {
-		opacity: 0.9;
+	opacity: 0.9;
 }
 
 .ns {
@@ -53,12 +45,6 @@ a:hover {
 	text-indent: 10px;
 }
 
-.headbar {
-	padding: 5px 0px 5px 5px;
-	width: 100%;
-	border-bottom: 1px solid black
-}
-
 .content {
 	padding: 20px 0px 20px 20px;
 }

doclet/resources/nav.js

@@ -1,9 +1,9 @@
-function goToHash(){
+function goToHash() {
-		if(window.location.hash != ""){
+	if (window.location.hash != "") {
-				document.getElementById("content-frame").src = window.location.hash.substr(1)
+		document.getElementById("content-frame").src = window.location.hash.substr(1)
-		}
+	}
 }
 
-function setHash(link){
+function setHash(link) {
-		window.parent.location.hash = link.getAttribute("newHash")
+	window.parent.location.hash = link.getAttribute("newHash")
 }

doclet/src/clojure/play_clj_doclet/html.clj

@@ -41,12 +41,17 @@
      [:div {:class "j-doc"} text])])
 
 (defn content
-  [{:keys [name docstring arglists java raw raw*]}]
+  [{:keys [name docstring arglists java raw raw*]} & [home-link-hash]]
   [:div {:class "content"}
    [:div {:class "item"}
     [:div {:class "clj"}
      (for [args arglists]
-       [:div {:class "c-head"} (pr-str args)])
+       [:div {:class "c-head"}
+        (if home-link-hash
+          [:a {:href (str "index.html" (str "#" home-link-hash))
+               :target "_top"}
+           (pr-str args)]
+          (pr-str args))])
      [:div {:class "c-doc"} docstring]]
     (when (> (count java) 0)
       (list [:div {:class "c-head"} "Options"]
@@ -61,7 +66,7 @@
      [:pre raw]]]])
 
 (defn create-site-file
-  ([name content home-link-hash]
+  ([name content]
    (html [:html
           [:head
            [:title name]
@@ -69,12 +74,6 @@
            [:link {:rel "stylesheet" :href "highlight.css"}]
            [:link {:rel "stylesheet" :href "main.css"}]]
           [:body
-           (when home-link-hash
-             [:div {:class "headbar"}
-              [:a {:href (str "index.html" (if (not-empty home-link-hash)
-                                             (str "#" home-link-hash)
-                                             "")) 
-                   :target "_top"} "Frames"]])
            content
            [:script {:src "highlight.js"}]
            [:script {:src "main.js"}]]])))
@@ -114,11 +113,11 @@
   (doseq [[ns groups] parsed-files]
     (doseq [{:keys [name] :as group} groups]
       (spit (io/file dir (str->filename ns name))
-            (create-site-file name (content group) (str->filename ns name)))))
+            (create-site-file name (content group (str->filename ns name))))))
   (spit (io/file dir "sidebar.html")
-        (create-site-file "sidebar" (sidebar parsed-files) nil))
+        (create-site-file "sidebar" (sidebar parsed-files)))
   (spit (io/file dir "blank.html")
-        (create-site-file "blank" nil ""))
+        (create-site-file "blank" nil))
   (spit (io/file dir "index.html")
         (index-frameset))
   (println "Created" (str dir "/")))