Merge pull request #8344 from jasoncostello/website-add-meganav

Website: Add Meganav

website/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "middleman-hashicorp", "0.3.12"
+gem "middleman-hashicorp", "0.3.13"

website/Gemfile.lock

@@ -77,7 +77,7 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-hashicorp (0.3.12)
+    middleman-hashicorp (0.3.13)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       middleman (~> 3.4)
@@ -151,7 +151,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman-hashicorp (= 0.3.12)
+  middleman-hashicorp (= 0.3.13)
 
 BUNDLED WITH
    1.14.6

website/Makefile

@@ -1,4 +1,4 @@
-VERSION?="0.3.12"
+VERSION?="0.3.13"
 
 website:
 	@echo "==> Starting website in Docker..."

website/packer.json

@@ -8,7 +8,7 @@
   "builders": [
     {
       "type": "docker",
-      "image": "hashicorp/middleman-hashicorp:0.3.12",
+      "image": "hashicorp/middleman-hashicorp:0.3.13",
       "discard": "true",
       "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
     }

website/source/assets/javascripts/application.js

@@ -3,6 +3,8 @@
 
 //= require lib/_Base
 
+//= require hashicorp/mega-nav
+
 //= require app/_app
 //= require app/_docs
 //= require app/_sidebar

website/source/assets/stylesheets/_global.scss

@@ -8,8 +8,9 @@ text-rendering: optimizeLegibility;
 }*/
 
 body {
-  font-size: 18px;
   color: $black;
+  font-family: $font-family-open-sans;
+  font-size: 18px;
   font-weight: 400;
 }
 
@@ -34,10 +35,6 @@ h3 {
   line-height: 1.2;
 }
 
-p, a {
-  font-family: $font-family-open-sans;
-}
-
 .highlight{
   margin-bottom: 18px;
 }

website/source/assets/stylesheets/_home.scss

@@ -4,11 +4,6 @@
     color: $purple-text;
     font-family: $font-family-klavika;
     text-transform: uppercase;
-    text-align: center;
-  }
-
-  p {
-    color: $purple-text;
   }
 
   .hero {
@@ -52,6 +47,8 @@
 
     h2 {
       color: $blue-text;
+      text-align: center;
+
     }
 
     hgroup {
@@ -61,12 +58,17 @@
       h3 {
         font-weight: bold;
         margin-bottom: $baseline;
+        text-align: center;
       }
 
       h4 {
         font-size: 20px;
+        text-align: center;
         line-height: $baseline * 1.5;
       }
+      p {
+        color: $purple-text;
+      }
     }
   }
 
@@ -76,6 +78,7 @@
 
     h2 {
       color: $white;
+      text-align: center;
     }
 
     pre {
@@ -93,6 +96,7 @@
 
     h2 {
       color: $dark-gray-text;
+      text-align: center;
     }
 
     .customer-logos {

website/source/assets/stylesheets/application.scss

@@ -6,6 +6,9 @@
 @import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600");
 @import url("//fonts.googleapis.com/css?family=Inconsolata:400,700");
 
+// Mega Nav
+@import 'hashicorp/mega-nav';
+
 // Core variables and mixins
 @import "_variables";
 

website/source/layouts/_header.erb

@@ -49,7 +49,6 @@
             <div class="navbar-header">
               <div class="navbar-brand">
                 <a class="logo" href="/">Vagrant</a>
-                <a class="by-hashicorp gray" href="https://www.hashicorp.com/"><span class="svg-wrap">by</span><%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>HashiCorp</a>
               </div>
               <button class="navbar-toggle gray" type="button">
                 <span class="sr-only">Toggle navigation</span>

website/source/layouts/layout.erb

@@ -1,3 +1,4 @@
+<%= mega_nav :vagrant %>
 <%= partial "layouts/header" %>
 <%= partial "layouts/sidebar" %>
 <%= yield %>