Remove the contact-us page and navbar menu items

Author: XhmikosR

Gemfile

@@ -5,5 +5,6 @@ gem 'jekyll-avatar', '~> 0.7.0'
 gem 'jekyll-email-protect', '~> 1.0.3'
 gem 'jekyll-feed', '~> 0.13.0'
 gem 'jekyll-paginate', '~> 1.1.0'
+gem 'jekyll-redirect-from', '~> 0.16.0'
 gem 'jekyll-sitemap', '~> 1.4.0'
 gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?

Gemfile.lock

@@ -37,6 +37,7 @@ GEM
     jekyll-feed (0.13.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.16.0)
     jekyll-sass-converter (2.0.1)
       sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.4.0)
@@ -78,6 +79,7 @@ DEPENDENCIES
   jekyll-email-protect (~> 1.0.3)
   jekyll-feed (~> 0.13.0)
   jekyll-paginate (~> 1.1.0)
+  jekyll-redirect-from (~> 0.16.0)
   jekyll-sitemap (~> 1.4.0)
   wdm (~> 0.1.1)
 

Gruntfile.js

@@ -279,7 +279,10 @@ module.exports = function(grunt) {
             options: {
                 relaxerror: ['W001', 'W002', 'W003']
             },
-            files: '<%= dirs.dest %>/**/*.html'
+            files: [
+                '<%= dirs.dest %>/**/*.html',
+                '!<%= dirs.dest %>/contact-us/index.html'
+            ]
         },
 
         eslint: {

_config.yml

@@ -10,8 +10,12 @@ plugins:
   - jekyll-email-protect
   - jekyll-feed
   - jekyll-paginate
+  - jekyll-redirect-from
   - jekyll-sitemap
 
+redirect_from:
+  json: false
+
 exclude:
   # we generate those files ourselves
   - "*.css"

bootstrap-customizer-config.json

@@ -401,11 +401,9 @@
     "panels.less",
     "wells.less",
     "close.less",
-    "component-animations.less",
-    "dropdowns.less"
+    "component-animations.less"
   ],
   "js": [
-    "dropdown.js",
     "collapse.js",
     "transition.js"
   ]

source/_includes/header.html

@@ -96,16 +96,6 @@ <h4><span class="fa fa-exclamation-circle" aria-hidden="true"></span> Warning</h
                                 <li{% if page.slug == "changelog" %} class="active"{% endif %}><a href="/changelog/"><span class="fa fa-file-text fa-fw" aria-hidden="true"></span> Changelog</a></li>
                                 <li{% if page.slug == "faq" %} class="active"{% endif %}><a href="/faq/"><span class="fa fa-info fa-fw" aria-hidden="true"></span> FAQ</a></li>
                                 <li{% if page.slug == "about" %} class="active"{% endif %}><a href="/about/"><span class="fa fa-users fa-fw" aria-hidden="true"></span> About</a></li>
-                                <li class="dropdown">
-                                    <a id="dLabel" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                                        <span class="fa fa-question fa-fw" aria-hidden="true"></span> Help <span class="fa fa-caret-down" aria-hidden="true"></span>
-                                    </a>
-                                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                                        <li {% if page.slug == "contact-us" %} class="active"{% endif %}><a href="/contact-us/">Contact us</a></li>
-                                        <li class="divider"></li>
-                                        <li><a href="https://trac.mpc-hc.org/wiki/How_to_Report_Issues">Bug reports</a></li>
-                                        <li><a href="https://trac.mpc-hc.org/">Wiki</a></li>
-                                    </ul>
                                 </li>
                             </ul>
                         </div> <!-- .navbar-collapse -->

source/assets/css/style.css

@@ -119,11 +119,6 @@ body {
     text-shadow: 0 0 20px #08c;
 }
 
-.navbar-default .navbar-nav > li > a,
-.dropdown-menu > li > a {
-    color: #727272;
-}
-
 .thumbnail {
     border: none;
 }

source/assets/css/vendor/bootstrap.css

@@ -2677,149 +2677,6 @@ tbody.collapse.in {
   -o-transition-timing-function: ease;
   transition-timing-function: ease;
 }
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-left: 2px;
-  vertical-align: middle;
-  border-top: 4px dashed;
-  border-top: 4px solid \9;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-}
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle:focus {
-  outline: 0;
-}
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  font-size: 14px;
-  text-align: left;
-  list-style: none;
-  background-color: #ffffff;
-  -webkit-background-clip: padding-box;
-  background-clip: padding-box;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-}
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu .divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
-}
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: 400;
-  line-height: 1.42857143;
-  color: #333333;
-  white-space: nowrap;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  color: #262626;
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #337ab7;
-  outline: 0;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #777777;
-}
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.open > .dropdown-menu {
-  display: block;
-}
-.open > a {
-  outline: 0;
-}
-.dropdown-menu-right {
-  right: 0;
-  left: auto;
-}
-.dropdown-menu-left {
-  right: auto;
-  left: 0;
-}
-.dropdown-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  color: #777777;
-  white-space: nowrap;
-}
-.dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 990;
-}
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  content: "";
-  border-top: 0;
-  border-bottom: 4px dashed;
-  border-bottom: 4px solid \9;
-}
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 2px;
-}
-@media (min-width: 768px) {
-  .navbar-right .dropdown-menu {
-    right: 0;
-    left: auto;
-  }
-  .navbar-right .dropdown-menu-left {
-    right: auto;
-    left: 0;
-  }
-}
 .btn-group,
 .btn-group-vertical {
   position: relative;