0.1.8 Change templates, enable navigation scroll.

wayt · Apr 23, 2013 · b25d1ac · b25d1ac
1 parent a4477b2
commit b25d1ac
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Creates from input files a documentation in path `doc/`.
 
 ## Changelog
 
+* `0.1.8` Change templates, enable navigation scroll.
 * `0.1.7` Add @apiIgnore. Update grunt Modules.
 * `0.1.6` Fix OSX executable
 * `0.1.5` Official release

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apidoc",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "RESTful web API Documentation Generator",
   "author": "Peter Rottmann <[email protected]>",
   "license": "MIT",

diff --git a/template/css/style.css b/template/css/style.css
@@ -19,17 +19,10 @@ td.code {
   font-weight: 400;
 }
 
-#border {
-	width: 264px;
-	height: 100%;
-	position: fixed;
-	background-color: #f5f5f5;
-}
-
 #content {
 	padding-top: 16px;
 	z-Index: -1;
-	margin-left: 264px;
+	margin-left: 270px;
 }
 
 p {
@@ -156,8 +149,10 @@ pre {
   border-radius: 6px;
   position: relative;
   margin: 10px 0 20px 0;
-  /* z-Index: -1; */
-  overflow: auto;
+}
+
+pre.language-json {
+	overflow: auto;
 }
 
 pre.language-html {
@@ -233,7 +228,14 @@ pre.language-json .pun {
 .sidenav {
   width: 228px;
   margin: 0;
-  padding: 0;
+  padding: 20px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  overflow-x: hidden;
+  overflow-y: auto;
+	background-color: #f5f5f5;
 }
 
 .sidenav > li > a {
@@ -280,10 +282,6 @@ pre.language-json .pun {
 	border-left: #e5e5e5 4px solid;
 }
 
-.sidenav.affix {
-  top: 20px;
-}
-
 /* ------------------------------------------------------------------------------------------
  * Compare
  * ------------------------------------------------------------------------------------------ */

diff --git a/template/index.html b/template/index.html
@@ -13,7 +13,7 @@
 <body>
 
 <script id="template-sidenav" type="text/x-handlebars-template">
-	<ul class="sidenav nav nav-list affix">
+	<ul class="sidenav nav nav-list">
 	{{#each nav}}
 		{{#if isHeader}}
 			{{#if isFixed}}
@@ -410,7 +410,6 @@ <h2>{{__ _title}}</h2>
 	{{/if}}
 </script>
 
-<div id="border"></div>
 <div class="container-fluid">
 	<div class="row-fluid">
 		<div class="span2">

diff --git a/template_basic/css/style.css b/template_basic/css/style.css
@@ -19,17 +19,10 @@ td.code {
   font-weight: 400;
 }
 
-#border {
-	width: 264px;
-	height: 100%;
-	position: fixed;
-	background-color: #f5f5f5;
-}
-
 #content {
 	padding-top: 16px;
 	z-Index: -1;
-	margin-left: 264px;
+	margin-left: 270px;
 }
 
 p {
@@ -156,8 +149,10 @@ pre {
   border-radius: 6px;
   position: relative;
   margin: 10px 0 20px 0;
-  /* z-Index: -1; */
-  overflow: auto;
+}
+
+pre.language-json {
+	overflow: auto;
 }
 
 pre.language-html {
@@ -236,7 +231,14 @@ pre .pun {
 .sidenav {
   width: 228px;
   margin: 0;
-  padding: 0;
+  padding: 20px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  overflow-x: hidden;
+  overflow-y: auto;
+	background-color: #f5f5f5;
 }
 
 .sidenav > li > a {
@@ -282,7 +284,3 @@ pre .pun {
 .sidenav > li.is-new a {
 	border-left: #e5e5e5 4px solid;
 }
-
-.sidenav.affix {
-  top: 20px;
-}
diff --git a/template_basic/index.html b/template_basic/index.html
@@ -13,7 +13,7 @@
 <body>
 
 <script id="template-sidenav" type="text/x-handlebars-template">
-	<ul class="sidenav nav nav-list affix">
+	<ul class="sidenav nav nav-list">
 	{{#each nav}}
 		{{#if isHeader}}
 			{{#if isFixed}}
@@ -145,7 +145,6 @@ <h2>{{__ _title}}</h2>
 	{{/if}}
 </script>
 
-<div id="border"></div>
 <div class="container-fluid">
 	<div class="row-fluid">
 		<div class="span2">