Merge with rc-botanic-webdev

--HG-- branch : quitta-gsoc-2013
12 years ago · 25d96701c4
parent 9806ea6ef0 7ef366d11d
commit 25d96701c4
2 changed files with 6 additions and 3 deletions
--- a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css
@ -15,3 +15,7 @@
 {
 	display:none;
 }
+
+.navbar {
+    border-bottom: 0px;
+}
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
@ -57,6 +57,7 @@
 </head>

 <body>
+  <div class="container-fluid">
 	{if ! isset($no_visible_elements) or  $no_visible_elements eq "FALSE"}
 	<div class="navbar">
 		<div class="navbar-inner">
@ -236,8 +237,6 @@
 	<script src="js/charisma.js"></script>
 	<!-- help script for page help -->
 	<script src="js/help.js"></script>
-
-
-
+  </div>
 </body>
 </html>