From 17b22424cc1b29fb31a8bab0cb1139bec30517ca Mon Sep 17 00:00:00 2001
From: tchncs <tchncs@vivaldi.net>
Date: Sun, 4 Sep 2016 17:36:45 +0200
Subject: [PATCH] add latest changes

---
 design/custom.css        | 22 +++++++++++++++++++-
 views/default.master.tpl | 44 ++++++++++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/design/custom.css b/design/custom.css
index 8bdbd27..c43a0c8 100644
--- a/design/custom.css
+++ b/design/custom.css
@@ -1 +1,21 @@
-a.disabled{pointer-events: none;color:lightgray}body{font-size:16px!important}.page-footer{max-height:60px!important;padding-bottom:12px!important;padding-top:18px!important;}.panel-footer, .MessageForm .Buttons, .CategoryBox .MorePager{background-color:none!important;border-top:none!important}.Connect{background-color:#fff!important;padding:15px;border-radius:4px}.LocaleOptions{margin-top:-32px!important}pre>code{border:0px solid #647077!important}
+.Message h4{}a.disabled{pointer-events: none;color:lightgray}body{font-size:16px!important}.page-footer{max-height:60px!important;padding-bottom:12px!important;padding-top:18px!important;}.panel-footer, .MessageForm .Buttons, .CategoryBox .MorePager{background-color:none!important;border-top:none!important}.Connect{background-color:#fff!important;padding:15px;border-radius:4px}.LocaleOptions{margin-top:-32px!important}pre>code{border:0px solid #647077!important}
+.MItem.IngameName:before { 
+content:"\f11b";
+color:#505050;
+border-radius: 2px;
+border-left: 1px solid;
+-border-top: 1px solid;
+-border-bottom: 1px solid;
+padding-right:0.5rem;
+font-size:120%;
+border-color: #C5C5C5
+}
+.MItem.IngameName {
+color:#505050;
+border-radius: 3px;
+border-left: 1px;
+border-top: 1px solid;
+border-bottom: 1px solid;
+border-right: 1px solid;
+border-color: #C5C5C5
+}
diff --git a/views/default.master.tpl b/views/default.master.tpl
index 72f1f51..f70f634 100644
--- a/views/default.master.tpl
+++ b/views/default.master.tpl
@@ -7,8 +7,41 @@
     <script type="text/javascript" src="//assets.illuna-minetest.tk/js/firefly.js"></script>
   </head>
   <body id="{$BodyID}" class="{$BodyClass} sticky-footer-body">
-    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-      <div class="container">
+    <nav class="navbar navbar-default navbar-static-top" style="margin-bottom:-3.6em;" id="hnav">
+        <div class="container">
+              <div class="navbar-header">
+              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#hnav" aria-expanded="false">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-ibar"></span>
+                <span class="icon-bar"></span>
+            </button>  
+        </div>
+        <div id="navbar" class="navbar-collapse collapse">
+         <ul class="nav navbar-nav">
+                <li class="active"><a href="//forum.illuna-minetest.tk">Forum </a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a href="//illuna-minetest.tk/rules">Rules</a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a href="//illuna-minetest.tk/faq">FAQ</a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a href="//illuna-minetest.tk/blog">Blog</a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a href="//illuna-minetest.tk/map">Map</a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a href="//illuna-minetest.tk/stats">Statistics</a></li>
+                <li><a id="nohover"><b>·</b></a></li>
+                <li class=""><a id="donate" href="//illuna-minetest.tk/donate">Donate</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
+                <li class=""><a href="//illuna-minetest.tk/contact">Contact &amp; Social</a></li>
+            </ul>
+            </div>
+        </div>
+    </nav>
+<div class="container" style="padding-top:4.9em;">
+    <nav class="navbar navbar-default" role="navigation" style="">
+      <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">{t c="Toggle navigation"}</span>
@@ -16,7 +49,6 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="{link path="home"}">{logo}</a>
         </div>
 
         <div class="navbar-collapse collapse">
@@ -45,7 +77,7 @@
         </div>
       </div>
     </nav>
-  <div style="padding-top:100px;"></div>
+</div>
     <section class="container">
       <div class="row">
         <main class="page-content" role="main">
@@ -61,7 +93,7 @@
         </aside>
       </div>
     </section>
-
+<a href="#" class="back-to-top nohover" style=""><i class="fa fa-chevron-up" aria-hidden="true" style="font-size:3.2em;"></i></a>
     <footer class="page-footer sticky-footer">
       <div class="container">
         <div class="clearfix">
@@ -73,7 +105,7 @@
     {event name="AfterBody"}
     <link href="//assets.tchncs.de/fonts/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link href="//assets.tchncs.de/fonts/cc-icons/css/cc-icons.min.css" rel="stylesheet">
-  </body>
+</body>
 </html>
 
 <!--
