From 8049040a5615c279b2e9c78f065a3116456d236e Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Fri, 3 Mar 2017 11:17:16 -0800 Subject: [PATCH 1/8] Add mega nav :zap: --- website/source/assets/javascripts/application.js | 2 ++ website/source/assets/stylesheets/application.scss | 3 +++ website/source/layouts/layout.erb | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/source/assets/javascripts/application.js b/website/source/assets/javascripts/application.js index 09cc5d6e1..55054b2a0 100644 --- a/website/source/assets/javascripts/application.js +++ b/website/source/assets/javascripts/application.js @@ -2,6 +2,8 @@ //= require lib/Base +//= require hashicorp/mega-nav + //= require docs //= require app/Sidebar ////= require app/Init diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index adf278595..b774fab2d 100644 --- 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=Inconsolata|Open+Sans:300,400,600"); +// Mega Nav +@import 'hashicorp/mega-nav'; + @import "_helpers"; @import "_reset"; diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index db61fc82e..38622f09a 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -35,7 +35,8 @@ height="0" width="0" style="display:none;visibility:hidden">
"> -
+ <%= mega_nav :terraform %> +
From f6549e0e26fd19cce47a2eacd005f6907839fa75 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:56:16 -0800 Subject: [PATCH 2/8] Remove p img width: 100% --- website/source/assets/stylesheets/_styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/assets/stylesheets/_styles.scss b/website/source/assets/stylesheets/_styles.scss index beac0f638..f26d8e108 100644 --- a/website/source/assets/stylesheets/_styles.scss +++ b/website/source/assets/stylesheets/_styles.scss @@ -97,7 +97,7 @@ p { } img { - width: 100%; + // width: 100%; } } From 9322a2f0695895ca3d7ee067bdcd859098fc06b8 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:56:28 -0800 Subject: [PATCH 3/8] Add meganav tag --- website/source/layouts/layout.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 38622f09a..0cfb26566 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -34,8 +34,10 @@ + + <%= mega_nav :packer %> +
"> - <%= mega_nav :terraform %>
From 65704e5b0ff486e52d1282c53afe9d32855497ba Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:56:54 -0800 Subject: [PATCH 4/8] For real --- website/source/assets/stylesheets/_styles.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/source/assets/stylesheets/_styles.scss b/website/source/assets/stylesheets/_styles.scss index f26d8e108..b82a58a6a 100644 --- a/website/source/assets/stylesheets/_styles.scss +++ b/website/source/assets/stylesheets/_styles.scss @@ -95,10 +95,6 @@ p { color: darken($green, 50%); } } - - img { - // width: 100%; - } } a { From a724d68504aabdc836d10a72dc42a91d50d05d71 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 7 Mar 2017 12:58:58 -0800 Subject: [PATCH 5/8] Remove "by hashicorp" --- website/source/layouts/layout.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 0cfb26566..9f7c63666 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -42,7 +42,6 @@
- by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp