Merge pull request #118 from openrocket/development

Merge dev to master

Author: SiboVG

.gitignore

@@ -15,7 +15,8 @@ node_modules
 
 
 # macOS Files
-.DS_Store
+**/.DS_Store
+**/Thumbs.db
 
 # VS Code history files
 .history

_includes/navbar.html

@@ -5,7 +5,7 @@
         <div>
           <img src="/img/OpenRocket_icon.png" alt=""/>
           <div>OpenRocket</div>
-          
+
         </div>
       </a>
       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -23,34 +23,37 @@
           <p class="navbar-btn" id="navbar_download_button" style="padding-right: 10px;"> {% include download_button.html %} </p>
         </li>
 
+        <li class="nav-button{% if page.url == '/' or page.url == '/index.html' %} active{% endif %}">
+          <a href="/index.html"><i class="fa fa-home"></i> Home</a>
+        </li>
 
-        <li class="dropdown nav-button">
+        <li class="dropdown nav-button{% if page.url == '/features.html' or page.url == '/documentation.html' or page.url == '/release_notes.html' %} active{% endif %}">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Docs <span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="/features.html">Screenshots &amp; Features</a></li>
+            <li{% if page.url == '/features.html' %} class="active"{% endif %}><a href="/features.html">Screenshots &amp; Features</a></li>
             <li><a href="https://openrocket.readthedocs.io/en/latest/" target="_blank">User Guide</a></li>
             <li><a href="https://openrocket.readthedocs.io/en/latest/dev_guide/development_overview.html" target="_blank">Developer Guide</a></li>
             <li><a href="https://wiki.openrocket.info/Main_Page" target="_blank">Wiki page (Old)</a></li>
-            <li><a href="/documentation.html">Technical Docs</a></li>
-            <li><a href="/release_notes.html">Release Notes</a></li>
+            <li{% if page.url == '/documentation.html' %} class="active"{% endif %}><a href="/documentation.html">Technical Docs</a></li>
+            <li{% if page.url == '/release_notes.html' %} class="active"{% endif %}><a href="/release_notes.html">Release Notes</a></li>
           </ul>
         </li>
 
-        <li class="nav-button"><a href="/downloads.html?vers={{site.current_version}}">Download</a></li>
+        <li class="nav-button{% if page.url contains '/downloads' %} active{% endif %}"><a href="/downloads.html?vers={{site.current_version}}">Download</a></li>
 
-        <li class="nav-button">
+        <li class="nav-button{% if page.url contains '/tutorials' %} active{% endif %}">
           <a href="/tutorials">
               Tutorials
               <span class="new-tag">NEW</span>
             </a>
         </li>
 
-        <li class="dropdown nav-button">
+        <li class="dropdown nav-button{% if page.url == '/contact.html' or page.url == '/contribute.html' %} active{% endif %}">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contact<span class="caret"></span></a>
           <ul class="dropdown-menu" role="menu">
-            <li><a href="/contact.html">Contact Info</a></li>
+            <li{% if page.url == '/contact.html' %} class="active"{% endif %}><a href="/contact.html">Contact Info</a></li>
             <li><a href="https://www.rocketryforum.com/forumdisplay.php?36-Rocketry-Electronics-and-Software" target="_blank">Rocketry Forum</a></li>
-            <li><a href="/contribute.html">Get Involved!</a></li>
+            <li{% if page.url == '/contribute.html' %} class="active"{% endif %}><a href="/contribute.html">Get Involved!</a></li>
           </uL>
         </li>
 

css/main.css

@@ -118,6 +118,16 @@ nav.navbar {
   border-bottom: none;
 }
 
+.nav-button.active {
+  background-color: #e8e8e8;
+  border-bottom: 2px solid #444444;
+}
+
+.nav-button.active > a {
+  color: #333333 !important;
+  font-weight: 600;
+}
+
 .btn-green, .btn-green:active, .btn-green:hover, .btn-red, .btn-red:active, .btn-red:hover {
   color: white !important;
 }