Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: Added docblox default configuration file. fixed apps css * master:
2012-03-03 16:49:22 -05:00
parent da78d8594f 952bcc5158
commit 1bed4010aa
3 changed files with 21 additions and 1 deletions
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -87,7 +87,7 @@
 					<li>$ap</li>
 					{{ endfor }}
 				</ul>
-			</li>
+			</li>	
 		{{ endif }}		
 		
      {{ if $nav.home }}
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -675,6 +675,13 @@ nav #nav-directory-link{
 	margin-left: 0px;
 	margin-right: 0px;
 	font-weight: bold;
+	margin: 3px 15px;
+	}
+nav #nav-apps-link{
+	margin-left: 0px;
+	margin-right: 0px;
+	font-weight: bold;
+	margin: 3px 15px;
 	}
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,