Merge pull request #2790 from hashicorp/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.coffee

@@ -9,3 +9,5 @@
 #= require _app/app
 #= require _app/homepage
 #= require _app/util
+
+#= require hashicorp/mega-nav

website/source/assets/stylesheets/_global.scss

@@ -10,6 +10,7 @@ text-rendering: optimizeLegibility;
 body {
   font-size: 15px;
   color: $black;
+  font-family: $font-family-open-sans;
   font-weight: 300;
 }
 
@@ -32,7 +33,7 @@ h3{
 }
 
 p, a, input, .alert {
-  font-family: $font-family-open-sans;
+
 }
 
 //an alternative color for buttons in the doc body

website/source/assets/stylesheets/_jumbotron.scss

@@ -47,7 +47,7 @@
     -webkit-backface-visibility:hidden;
 
     .jumbo-logo-wrap{
-      margin-top: 135px;
+      margin-top: 155px;
 
       .jumbo-logo{
         width: 318px;

website/source/assets/stylesheets/application.scss

@@ -3,7 +3,10 @@
 @import "bootstrap";
 
 // Remote fonts
-@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Open+Sans:300,400,600");
+@import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600");
+
+// Mega Nav
+@import 'hashicorp/mega-nav';
 
 // Core variables and mixins
 @import "_variables";
@@ -21,7 +24,6 @@
 @import 'hashicorp-shared/_hashicorp-sidebar';
 
 // Components
-@import '_announcement-bnr';
 @import "_header";
 @import '_footer';
 @import "_jumbotron";

website/source/layouts/_header.erb

@@ -43,14 +43,13 @@
     <!-- End Google Tag Manager (noscript) -->
 
     <div id="header" class="navigation <%= current_page.data.page_title == "home" ? "" : "navbar-static-top" %>">
-      <%= partial "layouts/announcement-bnr" %>
+      <%= mega_nav :consul %>
       <div class="container">
     		<div class="row">
     			<div class="col-xs-12">
     				<div class="navbar-header">
     					<div class="navbar-brand">
     						<a class="logo" href="/">Consul</a>
-    						<a class="by-hashicorp white" 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 white" type="button">
     						<span class="sr-only">Toggle navigation</span>