From d93df393e9eeb44de8986bcb74574c11aa13a14e Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Thu, 2 Mar 2017 21:59:41 -0800 Subject: [PATCH 01/18] Add mega nav :zap: --- website/source/assets/javascripts/application.js | 3 +++ website/source/assets/stylesheets/application.scss | 3 +++ website/source/layouts/layout.erb | 1 + 3 files changed, 7 insertions(+) diff --git a/website/source/assets/javascripts/application.js b/website/source/assets/javascripts/application.js index 5e308bc94..bc9250187 100644 --- a/website/source/assets/javascripts/application.js +++ b/website/source/assets/javascripts/application.js @@ -23,3 +23,6 @@ //= require app/_Engine.Typewriter //= require app/_Sidebar //= require app/_Init + +// assets/javascripts/application.js +//= require hashicorp/mega-nav diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index e4c0ae7a8..1a039a39c 100755 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -3,6 +3,9 @@ @import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,600"); +// Mega Nav +@import 'hashicorp/mega-nav'; + // Core variables and mixins @import '_variables'; diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 2b7a67363..5203f16b4 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -1,4 +1,5 @@ <%= partial "layouts/meta" %> +<%= mega_nav :terraform %> <%= partial "layouts/header" %> <%= partial "layouts/sidebar" %> <%= yield %> From 98424f87df70e5c5a9acc4f65e12ab03129dfda9 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Thu, 2 Mar 2017 22:02:19 -0800 Subject: [PATCH 02/18] Remove 'by hashicorp' --- website/source/layouts/_header.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index 8d98f7095..18ca6505b 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -6,7 +6,6 @@